Bug 21468: (QA follow-up) Enhance tests