Describe the enhancement requested

There were a few issues brought up on #40067 post-merge. This issue is solely to track finishing those tasks. Mainly adding a couple of tests and removing an unnecessary change to another test.

Component(s)

C++