Increasing coverage
Preparing for Travis CI build