Bug 23329: (RM follow-up) Add regression tests