Fix all tests, run tests on travis again