Fix basic tests
Update .travis.yml