Re #10137. Fixing broken unit tests.