Some minor cleaning up [ci skip].
Continue revising our testing strategy when it comes to CMake (on Windows) [ci skip].