diff --git a/include/util/tutil.h b/include/util/tutil.h
index 444a893a88..b29e1f7cfa 100644
--- a/include/util/tutil.h
+++ b/include/util/tutil.h
@@ -57,11 +57,13 @@ static FORCE_INLINE void taosEncryptPass_c(uint8_t *inBuf, size_t len, char *tar
   tMD5Init(&context);
   tMD5Update(&context, inBuf, (uint32_t)len);
   tMD5Final(&context);
+  char buf[TSDB_PASSWORD_LEN + 1];
 
-  sprintf(target, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
+  sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
           context.digest[1], context.digest[2], context.digest[3], context.digest[4], context.digest[5],
           context.digest[6], context.digest[7], context.digest[8], context.digest[9], context.digest[10],
           context.digest[11], context.digest[12], context.digest[13], context.digest[14], context.digest[15]);
+  memcpy(target, buf, TSDB_PASSWORD_LEN);
 }
 
 #ifdef __cplusplus
diff --git a/source/dnode/mnode/impl/src/mndFunc.c b/source/dnode/mnode/impl/src/mndFunc.c
index bf4baebd85..7e5dbb9566 100644
--- a/source/dnode/mnode/impl/src/mndFunc.c
+++ b/source/dnode/mnode/impl/src/mndFunc.c
@@ -538,7 +538,7 @@ static int32_t mndRetrieveFuncs(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataAppend(pColInfo, numOfRows, (const char *)&isAgg, false);
 
-    char b3[TSDB_TYPE_STR_MAX_LEN] = {0};
+    char b3[TSDB_TYPE_STR_MAX_LEN + 1] = {0};
     STR_WITH_MAXSIZE_TO_VARSTR(b3, mnodeGenTypeStr(buf, TSDB_TYPE_STR_MAX_LEN, pFunc->outputType, pFunc->outputLen),
                                pShow->pMeta->pSchemas[cols].bytes);
 
diff --git a/source/dnode/mnode/impl/test/acct/CMakeLists.txt b/source/dnode/mnode/impl/test/acct/CMakeLists.txt
index d72292e34b..40f8b0726e 100644
--- a/source/dnode/mnode/impl/test/acct/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/acct/CMakeLists.txt
@@ -5,9 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
-    add_test(
-        NAME acctTest
-        COMMAND acctTest
-    )
-endif(NOT TD_WINDOWS)
+add_test(
+    NAME acctTest
+    COMMAND acctTest
+)
diff --git a/source/dnode/mnode/impl/test/func/CMakeLists.txt b/source/dnode/mnode/impl/test/func/CMakeLists.txt
index 2a8eb0a39d..17adfde801 100644
--- a/source/dnode/mnode/impl/test/func/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/func/CMakeLists.txt
@@ -5,9 +5,9 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
+# if(NOT TD_WINDOWS)
     add_test(
         NAME funcTest
         COMMAND funcTest
     )
-endif(NOT TD_WINDOWS)
+# endif(NOT TD_WINDOWS)
diff --git a/source/dnode/mnode/impl/test/profile/CMakeLists.txt b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
index b6586192b2..049a4f3a9f 100644
--- a/source/dnode/mnode/impl/test/profile/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
@@ -5,9 +5,9 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
+# if(NOT TD_WINDOWS)
     add_test(
         NAME profileTest
         COMMAND profileTest
     )
-endif(NOT TD_WINDOWS)
+# endif(NOT TD_WINDOWS)
diff --git a/source/dnode/mnode/impl/test/show/CMakeLists.txt b/source/dnode/mnode/impl/test/show/CMakeLists.txt
index 9b4e21501e..33ba0c5697 100644
--- a/source/dnode/mnode/impl/test/show/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/show/CMakeLists.txt
@@ -5,9 +5,9 @@ target_link_libraries(
     PUBLIC sut
 )
 
-if(NOT TD_WINDOWS)
+# if(NOT TD_WINDOWS)
     add_test(
         NAME showTest
         COMMAND showTest
     )
-endif(NOT TD_WINDOWS)
+# endif(NOT TD_WINDOWS)
diff --git a/source/libs/index/test/CMakeLists.txt b/source/libs/index/test/CMakeLists.txt
index 2835084a81..040460ae5c 100644
--- a/source/libs/index/test/CMakeLists.txt
+++ b/source/libs/index/test/CMakeLists.txt
@@ -92,16 +92,14 @@ target_link_libraries (idxJsonUT
   index
 )
 
-if(NOT TD_WINDOWS)
-  add_test(
-    NAME idxtest
-    COMMAND idxTest
-  )
-  add_test(
-    NAME idxJsonUT
-    COMMAND idxJsonUT 
-  )
-endif(NOT TD_WINDOWS)
+add_test(
+  NAME idxtest
+  COMMAND idxTest
+)
+add_test(
+  NAME idxJsonUT
+  COMMAND idxJsonUT 
+)
 add_test(
   NAME idxUtilUT 
   COMMAND idxUtilUT 
diff --git a/source/libs/planner/test/CMakeLists.txt b/source/libs/planner/test/CMakeLists.txt
index abea60b0c7..b34ffa7bb1 100644
--- a/source/libs/planner/test/CMakeLists.txt
+++ b/source/libs/planner/test/CMakeLists.txt
@@ -32,9 +32,9 @@ if(${BUILD_WINGETOPT})
     target_link_libraries(plannerTest PUBLIC wingetopt)
 endif()
 
-if(NOT TD_WINDOWS)
+# if(NOT TD_WINDOWS)
     add_test(
         NAME plannerTest
         COMMAND plannerTest
     )
-endif(NOT TD_WINDOWS)
+# endif(NOT TD_WINDOWS)
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 587f9b5515..2b15f5031e 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -718,7 +718,7 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
   int16_t outputType = GET_PARAM_TYPE(&pOutput[0]);
   int64_t outputLen  = GET_PARAM_BYTES(&pOutput[0]);
 
-  char *outputBuf = taosMemoryCalloc(outputLen * pInput[0].numOfRows, 1);
+  char *outputBuf = taosMemoryCalloc(outputLen * pInput[0].numOfRows + 1, 1);
   char *output = outputBuf;
 
   for (int32_t i = 0; i < pInput[0].numOfRows; ++i) {
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 21d235ee5c..7eeddfd5c1 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -247,7 +247,7 @@ class TDDnode:
         if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
             print(updatecfgDict[0][0])
             for key, value in updatecfgDict[0][0].items():
-                if key == "clientCfg":
+                if key == "clientCfg" and self.remoteIP == "" and not platform.system().lower() == 'windows':
                     continue
                 if value == 'dataDir':
                     if isFirstDir: