Bug 22706: (RM follow-up) Add unit tests