Fixing tests on Travis