Fix tests for TravisCI