Fixed #21832 -- Fixed test failures.