Fixing unit test failures

[#54074563]