Bug 23523: (follow-up) Adjust tests for new expectations