Fixing tests for Travis, take 2