Further fixes to testing process for Travis