Update test
Merge bug25985 again