Change tests to get Travis CI compliant