Fixes tests broken by issue #27781.
4 files changed