Bug 8837 [QA Followup] - Add unit tests