more corner cases

[#71160248]
Adding a few more corner cases

[#71160248]