Fixing a few remaining errors in unit tests

[#68591002]