GitLab

* fix issue#727

* clang format

* refine unit tests

* fix cppcheck error

* fix review comments

* refine a unit test to cover more code changes

* fix cppcheck error

* remove unnecessary include file

* fix review comments

* clang format
Co-authored-by: Paul Fultz II <pfultz2@yahoo.com>
Co-authored-by: mvermeulen <5479696+mvermeulen@users.noreply.github.com>