Another test fix

This change fixes the final failing test.

[#59911894]
Merge 59911894-test-fixes to master

[Completes #59911894]