More changes to fix the tests in travis