Fix problems with tests on travis.