Fixed test failures introduced by refs #22881.