Bug 20607: (QA follow-up) Test corrections