Cleaned up CMakeLists.txt, converted TODO tag to doxygen-style tag in nc_test/util.c
Further development work.