Move main test runner to work with travis