Fix broken tests until 1.5 is released