Bug 16851 [QA Followup] - Fix Unit Tests