refactor: address code analysis violations in non-test
refactor: address code analysis violations in test
Merge pull request #174 from adamralph/167

167 address code analysis violations