Fixes to travis test runner