Fix tests
Merge bug 24926