Bug 8735 [QA Followup] - Add Unit Tests