Bug 25172: Adjust tests