Fix more travis tests