Shorten CAF CMake scripts.
Fix broken unit test.