Fixing a couple of test failures.

[#54066093]
[#54074653]