Bug 16942 [QA Followup] - Add unit test