Fix failing tunnel tests for travis and fix flaky tests that require job to be stopped.