Clean up CI test issues

Problem/Motivation

CI tests like phpcs, eslint, and other identify some issues that could be cleaned up.

Proposed resolution

Resolve the issue identified.