Add a test
Merge bug25921