Clean CMakeLists.txt, add unitTest