Bug 14637: Followup - Fix number of tests due to rebase