Cleaning up test/CMakeLists.txt