fixes test breakages