More CMake testing work.