Bug 13937: (QA follow-up) Fix tests.