Bug 21800: (RM follow-up) Fix unit tests