Fix the travis build
Fix more tests