Bug 23612: (RM follow-up) Fix failing tests