Bug 22563: (follow-up) Corrections for overdue tests