Fix test runner in .travis.yml
Fix imports in tests
Merge branch 'fix-travis'