Fixing tests for Travis