Re #10137. Fixing more unit tests.