Due to 7f33f01b72 PR Close #20175
7f33f01b72
We were missing quite a bit of test coverage, this is the start of recreating it. PR Close #19703