Bug 10402: (QA followup) amend unit tests