Bug 21896: RM follow-up - fix tests