Bug 11425 [QA Followup] - Fix number of unit tests