Fix some tests
Fix more tests (and run on Travis)