Fix travis (broken by test setup simplification)