Work on the test coverage after Travis suggestions