josephschmitt Improve test coverage