fixes after refactoring
fix .travis.yml