Fixed test failures introduced by #12288