Update tests for TravisCI