Trying to fix tests for travis