Added a bit of work for testing.
Added some logic for testing.
Merge branch 'feature/testing-support' into develop
Added more work to stabilize CMake build environment.