Fix travis related test errors