Bug 20912: (QA follow-up) Fix some test failures