Add some tests
Merge bug26151