Fixed issues with test for Travis CI