Make tests pass in Travis