Bug 17080 [QA Followup] - Fix number of tests