We were missing quite a bit of test coverage, this is the start of recreating it. PR Close #19703
PR Close #18960