Try to get the tests passing on Travis