Bug 20058: (QA follow-up) Simplify test code