Bug 15685: (QA follow-up) Tidy tests