Fixed test breakages