Add some more tests (#24103)