Attempt at fixing tests on Travis