Simplified .travis.yml
Continued refactoring tests
Continued refactoring tests
Continued refactoring tests