Tweak tests for Travis CI