This does the same thing to the CMake tests that is done to the Bazel tests, and now makes the CMake tests pass.
