Fixing tests for travis