Bug 16174: (QA followup) Fix remaining tests