Adjusted for TravisCI testing