Fix TravisCI build
Remove annoyances from existing tests