Update tests which broke from r218189