Made test travis friendly (again)