Refs #17488. Fixed analysis warnings
Refs #17488. Fixed tests