Bug 22454: (RM follow-up) Adjusts tests to avoid random failure