Bug 24759: (follow-up) Fix tests