Update .travis.yml and fix tests

:construction: