This should make the tests pass on Travis