fixes to get the tests working on Travis