Making tests more stable for travis