Bug 21411: (QA follow-up) fix tests