Small connectivity refactor for travis