Trying to fix tests on Travis