Fix CMake and CUnit weirdness