Implement fix for travis test speedups