Bug 23517: (follow-up) Tidy tests