Refs #21182 - Fix tests