Address comments and test failures (#21832)
Address comments and test failures (#21832)

idaholab/moose,andrsd/moose,laagesen/moose,andrsd/moose,sapitts/moose,laagesen/moose,idaholab/moose,andrsd/moose,idaholab/moose,laagesen/moose,sapitts/moose,laagesen/moose,idaholab/moose,andrsd/moose,andrsd/moose,sapitts/moose,sapitts/moose,laagesen/moose,sapitts/moose,idaholab/moose