Bug 21337: (RM follow-up) Adjust number of tests