diff --git a/source/dnode/mnode/impl/src/mnode.c b/source/dnode/mnode/impl/src/mnode.c
index e902e13a36..3a55961d4a 100644
--- a/source/dnode/mnode/impl/src/mnode.c
+++ b/source/dnode/mnode/impl/src/mnode.c
@@ -202,8 +202,6 @@ static int32_t mndExecSteps(SMnode *pMnode) {
     SMnodeStep *pStep = taosArrayGet(pMnode->pSteps, pos);
     if (pStep->initFp == NULL) continue;
 
-    // (*pMnode->reportProgress)(pStep->name, "start initialize");
-
     if ((*pStep->initFp)(pMnode) != 0) {
       int32_t code = terrno;
       mError("step:%s exec failed since %s, start to cleanup", pStep->name, terrstr());
@@ -213,8 +211,6 @@ static int32_t mndExecSteps(SMnode *pMnode) {
     } else {
       mDebug("step:%s is initialized", pStep->name);
     }
-
-    // (*pMnode->reportProgress)(pStep->name, "initialize completed");
   }
 
   return 0;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 966eb94354..59cbbb3147 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
 #ADD_SUBDIRECTORY(examples/c)
 ADD_SUBDIRECTORY(tsim)
-#ADD_SUBDIRECTORY(test/c)
+ADD_SUBDIRECTORY(test/c)
 #ADD_SUBDIRECTORY(comparisonTest/tdengine)
diff --git a/tests/test/c/CMakeLists.txt b/tests/test/c/CMakeLists.txt
index 2702d192d3..ebe9f96989 100644
--- a/tests/test/c/CMakeLists.txt
+++ b/tests/test/c/CMakeLists.txt
@@ -1,52 +1,8 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20)
-PROJECT(TDengine)
-
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/plugins/http/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
-
-IF (TD_LINUX)
-  #add_executable(insertPerTable insertPerTable.c)
-  #target_link_libraries(insertPerTable taos_static pthread)
-
-  #add_executable(insertPerRow insertPerRow.c)
-  #target_link_libraries(insertPerRow taos_static pthread)
-
-  #add_executable(importOneRow importOneRow.c)
-  #target_link_libraries(importOneRow taos_static pthread)
-
-  #add_executable(importPerTable importPerTable.c)
-  #target_link_libraries(importPerTable taos_static pthread)
-
-  #add_executable(hashPerformance hashPerformance.c)
-  #target_link_libraries(hashPerformance taos_static tutil common pthread)
-
-  #add_executable(createTablePerformance createTablePerformance.c)
-  #target_link_libraries(createTablePerformance taos_static tutil common pthread)
-
-  #add_executable(createNormalTable createNormalTable.c)
-  #target_link_libraries(createNormalTable taos_static tutil common pthread)
-
-  #add_executable(queryPerformance queryPerformance.c)
-  #target_link_libraries(queryPerformance taos_static tutil common pthread)
-  
-  #add_executable(httpTest httpTest.c)
-  #target_link_libraries(httpTest taos_static tutil common pthread mnode monitor http tsdb twal vnode cJson lz4)
-
-  #add_executable(cacheTest cacheTest.c)
-  #target_link_libraries(cacheTest taos_static tutil common pthread mnode monitor http tsdb twal vnode cJson lz4)
-
-  #add_executable(invalidTableId invalidTableId.c)
-  #target_link_libraries(invalidTableId taos_static tutil common pthread)
-
-  #add_executable(hashIterator hashIterator.c)
-  #target_link_libraries(hashIterator taos_static tutil common pthread)
-ENDIF()
-
+add_executable(create_table create_table.c)
+target_link_libraries(
+    create_table
+    PUBLIC taos
+    PUBLIC util
+    PUBLIC common
+    PUBLIC os
+)
diff --git a/tests/test/c/createNormalTable.c b/tests/test/c/create_table.c
similarity index 98%
rename from tests/test/c/createNormalTable.c
rename to tests/test/c/create_table.c
index f9e4aa5a3a..d51292ae01 100644
--- a/tests/test/c/createNormalTable.c
+++ b/tests/test/c/create_table.c
@@ -14,13 +14,14 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "../../../include/client/taos.h"
-#include "hash.h"
 #include "os.h"
+
+#include "taos.h"
+#include "taosdef.h"
 #include "taoserror.h"
-#include "tglobal.h"
-#include "tulog.h"
+#include "thash.h"
 #include "tutil.h"
+#include "ulog.h"
 
 #define MAX_RANDOM_POINTS 20000
 #define GREEN "\033[1;32m"
diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
index def421c212..b351675e47 100644
--- a/tools/shell/CMakeLists.txt
+++ b/tools/shell/CMakeLists.txt
@@ -1,6 +1,4 @@
 aux_source_directory(src SHELL_SRC)
-list(REMOVE_ITEM SHELL_SRC src/shellWindows.c)
-list(REMOVE_ITEM SHELL_SRC src/shellDarwin.c)
 
 add_executable(shell ${SHELL_SRC})
 target_link_libraries(