Fix test breakages