More work on testing with CMake.