Add more tests (#24103)