Still trying to make the tests pass on travis