Continue revising our testing strategy when it comes to CMake (on Windows/Linux this time). Also some minor cleaning up (for OS X). [ci skip]