Updating CMakeLists.txt for Test apps