Fixing the tests and Travis integration