Issue #3496505: Addressing additional coding standards and static analysis issues that surfaced after wrapping up test refactoring.
Closes #3496505