modularize tests
modularize tests
update travis for new test structure
fix typo