Added further fixes, tests for #19949/f33db5a09a.

Thanks Susan Tan. Refs #19949.