Bug 15897 [QA Followup] - Update unit tests