diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
index 62d22573ff1981a1b12dc9a4aaaee92f2c3c1a5f..0e91cc7155daeb8057a560d80f78582cca584f85 100644
--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -266,9 +266,12 @@ static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg) {
   return taosCfgDynamicOptions(pCfg->config);
 }
 
-
 void dnodeUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
-  dTrace("mgmt IP list is changed for ufp is called");
+  dPrint("mnode IP list is changed for ufp is called, numOfIps:%d inUse:%d", pIpSet->numOfIps, pIpSet->inUse);
+  for (int i = 0; i < pIpSet->numOfIps; ++i) {
+    dPrint("mnode index:%d %s:%u", i, pIpSet->fqdn[i], pIpSet->port[i])
+  }
+
   tsMnodeIpSet = *pIpSet;
 }
 
diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c
index 4f54a85baa79fa7b386b63b4484e3f821dabe6a0..2f17df92fa70a218b666a18557ceb4f8fc15e737 100644
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@@ -297,8 +297,10 @@ static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate) {
   if (pDb != NULL) {
     mgmtDecDbRef(pDb); 
     if (pCreate->ignoreExist) {
+      mTrace("db:%s, already exist, ignore exist is set", pCreate->db);
       return TSDB_CODE_SUCCESS;
     } else {
+      mError("db:%s, is already exist, ignore exist not set", pCreate->db);
       return TSDB_CODE_DB_ALREADY_EXIST;
     }
   }
@@ -751,6 +753,8 @@ static void mgmtProcessCreateDbMsg(SQueuedMsg *pMsg) {
     code = mgmtCreateDb(pMsg->pUser->pAcct, pCreate);
     if (code == TSDB_CODE_SUCCESS) {
       mLPrint("db:%s, is created by %s", pCreate->db, pMsg->pUser->user);
+    } else {
+      mError("db:%s, failed to create, reason:%s", pCreate->db, tstrerror(code));
     }
   }
 
diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index aa0fbf65b7114b4a18adfccd7f2137a9ecb3fa63..a99edfd93d1d06701542877b9831603e5204110e 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -1,26 +1,20 @@
-################################# 
 run general/cache/new_metrics.sim
 run general/compress/compress.sim
 run general/compute/avg.sim
-run general/compute/bottom.sim
 run general/compute/count.sim
 run general/db/len.sim
 run general/db/basic4.sim
 run general/http/restful_insert.sim
 run general/import/basic.sim
 run general/import/commit.sim
-run general/insert/basic.sim
 run general/insert/query_file_memory.sim
 run general/parser/binary_escapeCharacter.sim
 run general/parser/columnValue_bigint.sim
 run general/parser/select_from_cache_disk.sim
 run general/table/autocreate.sim
-run general/table/basic3.sim
 run general/table/column_name.sim
 run general/table/int.sim
 run general/table/vgroup.sim
 run general/user/basic1.sim
 run general/user/pass_alter.sim
-run general/user/user_len.sim
 run general/vector/single.sim
-################################## 
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
index 0117d87104fc98ed01422c6534afdb57566b6284..d8b27630427ac434dfce6649648c78edf09ac27a 100644
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -26,6 +26,7 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
+sleep 2000
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
index 2cac8b8fa882e10befcb6d6602665373cef1e8f6..87863001a3dfab6bb16a9919910b5e7bedd7863d 100644
--- a/tests/script/general/db/testSuite.sim
+++ b/tests/script/general/db/testSuite.sim
@@ -1,4 +1,4 @@
-run general//db/basic.sim
+run general/db/basic.sim
 run general/db/basic1.sim
 run general/db/basic2.sim
 run general/db/basic3.sim
@@ -13,3 +13,4 @@ run general/db/delete_writing2.sim
 run general/db/len.sim
 run general/db/repeat.sim
 run general/db/tables.sim
+run general/db/vnodes.sim
diff --git a/tests/script/general/db/vnodes.sim b/tests/script/general/db/vnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..87e821fde3e72bc5c94183322faac6c618ef3f2d
--- /dev/null
+++ b/tests/script/general/db/vnodes.sim
@@ -0,0 +1,45 @@
+system sh/stop_dnodes.sh
+
+$totalVnodes = 100
+$maxTables = 4
+$totalRows = $totalVnodes * $maxTables
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel            -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode   -v $maxTables
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
+system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000
+system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000
+system sh/cfg.sh -n dnode1 -c maxShellConns       -v 100000
+system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 100000
+
+print ==========  prepare data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect 
+sql create database db blocks 2 cache 1 maxTables $maxTables
+sql use db
+
+print ==========  step1
+sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$x = 0
+while $x < $totalRows
+  $tb = t . $x
+  sql create table $tb using mt tags( $x )
+  sql insert into $tb values (now, $x ) 
+  $x = $x + 1
+endw 
+
+print ========== step2
+sql select * from mt
+if $rows != $totalRows then
+  return -1
+endi  
+
+sql select count(*) from mt
+if $data00 != $totalRows then
+  return -1
+endi  
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index d96a1db2b40c37d87366dff31448064b26169b07..f73a23f1845809cbb8a1711d948a7e71058a9189 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -15,12 +15,12 @@ cd ../../../debug; make
 #./test.sh -f general/alter/table.sim
 
 ./test.sh -f general/cache/new_metrics.sim
-#./test.sh -f general/cache/restart_metrics.sim
+./test.sh -f general/cache/restart_metrics.sim
 ./test.sh -f general/cache/restart_table.sim
 
-#./test.sh -f general/column/commit.sim
-#./test.sh -f general/column/metrics.sim
-#./test.sh -f general/column/table.sim
+#hongze ./test.sh -f general/column/commit.sim
+#hongze ./test.sh -f general/column/metrics.sim
+#hongze ./test.sh -f general/column/table.sim
 
 ./test.sh -f general/compress/commitlog.sim
 ./test.sh -f general/compress/compress.sim
@@ -31,11 +31,11 @@ cd ../../../debug; make
 ./test.sh -f general/compute/bottom.sim
 ./test.sh -f general/compute/count.sim
 ./test.sh -f general/compute/diff.sim
-#./test.sh -f general/compute/diff2.sim
+# liao./test.sh -f general/compute/diff2.sim
 ./test.sh -f general/compute/first.sim
-#./test.sh -f general/compute/interval.sim
-#./test.sh -f general/compute/last.sim
-#./test.sh -f general/compute/leastsquare.sim
+# liao./test.sh -f general/compute/interval.sim
+# liao./test.sh -f general/compute/last.sim
+# liao./test.sh -f general/compute/leastsquare.sim
 ./test.sh -f general/compute/max.sim
 ./test.sh -f general/compute/min.sim
 ./test.sh -f general/compute/null.sim
@@ -53,41 +53,42 @@ cd ../../../debug; make
 ./test.sh -f general/db/delete_reuse1.sim
 ./test.sh -f general/db/delete_reuse2.sim
 ./test.sh -f general/db/delete_reusevnode.sim
-#./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_reusevnode2.sim
 ./test.sh -f general/db/delete_writing1.sim
 ./test.sh -f general/db/delete_writing2.sim
 ./test.sh -f general/db/len.sim
+#./test.sh -u -f general/db/vnodes.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
 
-#./test.sh -f general/field/2.sim
+./test.sh -f general/field/2.sim
 #./test.sh -f general/field/3.sim
 #./test.sh -f general/field/4.sim
 #./test.sh -f general/field/5.sim
 #./test.sh -f general/field/6.sim
-##./test.sh -f general/field/bigint.sim
-#./test.sh -f general/field/binary.sim
-##./test.sh -f general/field/bool.sim
-#./test.sh -f general/field/single.sim
-##./test.sh -f general/field/smallint.sim
-##./test.sh -f general/field/tinyint.sim
-
-##./test.sh -f general/http/restful.sim
+./test.sh -f general/field/bigint.sim
+# liao./test.sh -f general/field/binary.sim
+./test.sh -f general/field/bool.sim
+./test.sh -f general/field/single.sim
+./test.sh -f general/field/smallint.sim
+./test.sh -f general/field/tinyint.sim
+
+# jeff ./test.sh -f general/http/restful.sim
 ./test.sh -f general/http/restful_insert.sim
 ./test.sh -f general/http/restful_limit.sim
-##./test.sh -f general/http/restful_full.sim
+# jeff ./test.sh -f general/http/restful_full.sim
 ./test.sh -f general/http/prepare.sim
 ./test.sh -f general/http/telegraf.sim
 ./test.sh -f general/http/grafana_bug.sim
-#./test.sh -f general/http/grafana.sim
+# jeff ./test.sh -f general/http/grafana.sim
 
 ./test.sh -f general/import/basic.sim
 ./test.sh -f general/import/commit.sim
 ./test.sh -f general/import/large.sim
-#./test.sh -f general/import/replica1.sim
+#hongze ./test.sh -f general/import/replica1.sim
 
 ./test.sh -f general/insert/basic.sim
-#./test.sh -f general/insert/insert_drop.sim
+#hongze ./test.sh -f general/insert/insert_drop.sim
 ./test.sh -f general/insert/query_block1_memory.sim
 ./test.sh -f general/insert/query_block2_memory.sim
 ./test.sh -f general/insert/query_block1_file.sim
@@ -96,8 +97,6 @@ cd ../../../debug; make
 ./test.sh -f general/insert/query_multi_file.sim
 ./test.sh -f general/insert/tcp.sim
 
-#parser
-
 # ./test.sh -f general/parser/alter.sim
 # ./test.sh -f general/parser/alter1.sim
 # ./test.sh -f general/parser/alter_stable.sim
@@ -112,8 +111,8 @@ cd ../../../debug; make
 ./test.sh -f general/parser/columnValue_float.sim
 ./test.sh -f general/parser/columnValue_int.sim
 # ./test.sh -f general/parser/col_arithmetic_operation.sim
-# ./test.sh -f general/parser/columnValue.sim
-# ./test.sh -f general/parser/commit.sim
+./test.sh -f general/parser/columnValue.sim
+./test.sh -f general/parser/commit.sim
 # ./test.sh -f general/parser/create_db.sim
 # ./test.sh -f general/parser/create_mt.sim
 # ./test.sh -f general/parser/create_tb.sim
@@ -121,9 +120,9 @@ cd ../../../debug; make
 # ./test.sh -f general/parser/fill.sim
 # ./test.sh -f general/parser/fill_stb.sim
 # ./test.sh -f general/parser/first_last.sim
-# ./test.sh -f general/parser/import_commit1.sim
-# ./test.sh -f general/parser/import_commit2.sim
-# ./test.sh -f general/parser/import_commit3.sim
+./test.sh -f general/parser/import_commit1.sim
+./test.sh -f general/parser/import_commit2.sim
+./test.sh -f general/parser/import_commit3.sim
 # ./test.sh -f general/parser/import_file.sim
 # ./test.sh -f general/parser/insert_tb.sim
 # ./test.sh -f general/parser/tags_dynamically_specifiy.sim
@@ -167,7 +166,7 @@ cd ../../../debug; make
 ./test.sh -f general/table/autocreate.sim
 ./test.sh -f general/table/basic1.sim
 ./test.sh -f general/table/basic2.sim
-./test.sh -f general/table/basic3.sim
+#hongze ./test.sh -f general/table/basic3.sim
 ./test.sh -f general/table/bigint.sim
 ./test.sh -f general/table/binary.sim
 ./test.sh -f general/table/bool.sim
@@ -187,7 +186,7 @@ cd ../../../debug; make
 ./test.sh -f general/table/int.sim
 ./test.sh -f general/table/limit.sim
 ./test.sh -f general/table/smallint.sim
-#./test.sh -f general/table/table_len.sim
+./test.sh -f general/table/table_len.sim
 ./test.sh -f general/table/table.sim
 ./test.sh -f general/table/tinyint.sim
 ./test.sh -f general/table/vgroup.sim
@@ -197,45 +196,45 @@ cd ../../../debug; make
 #./test.sh -f general/tag/5.sim
 #./test.sh -f general/tag/6.sim
 #./test.sh -f general/tag/add.sim
-#./test.sh -f general/tag/bigint.sim
+./test.sh -f general/tag/bigint.sim
 #./test.sh -f general/tag/binary_binary.sim
 #./test.sh -f general/tag/binary.sim
 #./test.sh -f general/tag/bool_binary.sim
 #./test.sh -f general/tag/bool_int.sim
-#./test.sh -f general/tag/bool.sim
+./test.sh -f general/tag/bool.sim
 #./test.sh -f general/tag/change.sim
-#./test.sh -f general/tag/column.sim
+#liao ./test.sh -f general/tag/column.sim
 #./test.sh -f general/tag/commit.sim
-#./test.sh -f general/tag/create.sim
+#liao ./test.sh -f general/tag/create.sim
 #./test.sh -f general/tag/delete.sim
 #./test.sh -f general/tag/double.sim
-#./test.sh -f general/tag/filter.sim
+./test.sh -f general/tag/filter.sim
 #./test.sh -f general/tag/float.sim
 #./test.sh -f general/tag/int_binary.sim
 #./test.sh -f general/tag/int_float.sim
-#./test.sh -f general/tag/int.sim
+./test.sh -f general/tag/int.sim
 #./test.sh -f general/tag/set.sim
-#./test.sh -f general/tag/smallint.sim
-#./test.sh -f general/tag/tinyint.sim
+./test.sh -f general/tag/smallint.sim
+./test.sh -f general/tag/tinyint.sim
 
 ./test.sh -f general/user/basic1.sim
-#./test.sh -f general/user/monitor.sim
+./test.sh -f general/user/monitor.sim
 ./test.sh -f general/user/pass_alter.sim
 ./test.sh -f general/user/pass_len.sim
 ./test.sh -f general/user/user_create.sim
 ./test.sh -f general/user/user_len.sim
 
-#./test.sh -f general/vector/metrics_field.sim
-#./test.sh -f general/vector/metrics_mix.sim
-#./test.sh -f general/vector/metrics_query.sim
-#./test.sh -f general/vector/metrics_tag.sim
-#./test.sh -f general/vector/metrics_time.sim
-#./test.sh -f general/vector/multi.sim
+./test.sh -f general/vector/metrics_field.sim
+./test.sh -f general/vector/metrics_mix.sim
+./test.sh -f general/vector/metrics_query.sim
+./test.sh -f general/vector/metrics_tag.sim
+./test.sh -f general/vector/metrics_time.sim
+#liao ./test.sh -f general/vector/multi.sim
 ./test.sh -f general/vector/single.sim
-#./test.sh -f general/vector/table_field.sim
-#./test.sh -f general/vector/table_mix.sim
-#./test.sh -f general/vector/table_query.sim
-#./test.sh -f general/vector/table_time.sim
+./test.sh -f general/vector/table_field.sim
+./test.sh -f general/vector/table_mix.sim
+./test.sh -f general/vector/table_query.sim
+./test.sh -f general/vector/table_time.sim
 
 #################################  
 
@@ -253,7 +252,7 @@ cd ../../../debug; make
 
 #./test.sh -u -f unique/big/balance.sim
 #./test.sh -u -f unique/big/maxvnodes.sim
-#./test.sh -u -f unique/big/tcp.sim
+./test.sh -u -f unique/big/tcp.sim
 
 ##./test.sh -u -f unique/cluster/balance1.sim
 ##./test.sh -u -f unique/cluster/balance2.sim
@@ -298,13 +297,13 @@ cd ../../../debug; make
 #./test.sh -u -f unique/metrics/replica3_dnode6.sim
 #./test.sh -u -f unique/metrics/replica3_vnode3.sim
 
-##./test.sh -u -f unique/mnode/mgmt22.sim
-##./test.sh -u -f unique/mnode/mgmt23.sim
-##./test.sh -u -f unique/mnode/mgmt24.sim
-##./test.sh -u -f unique/mnode/mgmt25.sim
-##./test.sh -u -f unique/mnode/mgmt26.sim
-##./test.sh -u -f unique/mnode/mgmt33.sim
-##./test.sh -u -f unique/mnode/mgmt34.sim
+./test.sh -u -f unique/mnode/mgmt22.sim
+./test.sh -u -f unique/mnode/mgmt23.sim
+./test.sh -u -f unique/mnode/mgmt24.sim
+./test.sh -u -f unique/mnode/mgmt25.sim
+./test.sh -u -f unique/mnode/mgmt26.sim
+./test.sh -u -f unique/mnode/mgmt33.sim
+./test.sh -u -f unique/mnode/mgmt34.sim
 #./test.sh -u -f unique/mnode/mgmtr2.sim
 #./test.sh -u -f unique/mnode/secondIp.sim
 
@@ -312,13 +311,10 @@ cd ../../../debug; make
 
 ##./test.sh -u -f unique/table/delete_part.sim
 
-##./test.sh -u -f unique/vnode/replica2_basic2.sim
-##./test.sh -u -f unique/vnode/replica3_basic.sim
-
 #./test.sh -u -f unique/vnode/commit.sim
 #./test.sh -u -f unique/vnode/many.sim
 #./test.sh -u -f unique/vnode/replica2_basic.sim
-##./test.sh -u -f unique/vnode/replica2_basic2.sim
+./test.sh -u -f unique/vnode/replica2_basic2.sim
 #./test.sh -u -f unique/vnode/replica2_repeat.sim
 ##./test.sh -u -f unique/vnode/replica3_basic.sim
 #./test.sh -u -f unique/vnode/replica3_repeat.sim
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 5587e3bb8c16d38e952630c894d99996e20cefaa..bc18479896993fa4a74febfdcd36387a011d95ba 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -99,7 +99,7 @@ echo "logDir              $LOG_DIR"       >> $TAOS_CFG
 echo "dDebugFlag          199"            >> $TAOS_CFG
 echo "mDebugFlag          199"            >> $TAOS_CFG
 echo "sdbDebugFlag        199"            >> $TAOS_CFG
-echo "rpcDebugFlag        135"            >> $TAOS_CFG
+echo "rpcDebugFlag        151"            >> $TAOS_CFG
 echo "tmrDebugFlag        131"            >> $TAOS_CFG
 echo "cDebugFlag          135"            >> $TAOS_CFG
 echo "httpDebugFlag       135"            >> $TAOS_CFG
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
index d1d5ebece037cec40f895ca1e3f02e2991c27923..1966e1a7ce745bcbc8760a703b1b30824dea67a2 100644
--- a/tests/script/unique/account/account_create.sim
+++ b/tests/script/unique/account/account_create.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 print ============================ dnode1 start
 
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
index 71a75a7b350ce01ca7f0d2fac5e6d1ad3e7be0e9..40075dc1a6dc314b5b309670d6a51e89f949e84e 100644
--- a/tests/script/unique/account/account_delete.sim
+++ b/tests/script/unique/account/account_delete.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 print ============= step1
 sql create account oroot pass 'taosdata' 
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
index ae2db26d58f5a51916eca2c7bd7ac675108ffbd5..81d0f0bfb134a4282823b40602bf53583ea17d90 100644
--- a/tests/script/unique/account/account_len.sim
+++ b/tests/script/unique/account/account_len.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 $i = 0
 $dbPrefix = aldb
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
index fe978a5827c89d6a4b6aa2fa2c9b5fdadb4b7c5e..2bb61cb0f28a180ef1960943717f0db2136b17ec 100644
--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
@@ -4,8 +4,8 @@ system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 print ============= step1
 
diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim
index d06f7a15d9dd56b9f161d44f32c57e0f8156cb8f..adbc84d76679fee4ccd49f6951edb11c3b7df670 100644
--- a/tests/script/unique/account/basic.sim
+++ b/tests/script/unique/account/basic.sim
@@ -1,6 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim
index b2e540400c0c5ab5849c0816a439ede7664350af..70a423f70f583734d69f6bda59f98a9a4ae4c3eb 100644
--- a/tests/script/unique/account/paras.sim
+++ b/tests/script/unique/account/paras.sim
@@ -1,6 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
index 936611833a83148378802bbca3c7c14c1df56915..644548be0bd49da1d015cd480b5b88435fbbe588 100644
--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 print ============= step1
 sql create user read pass 'taosdata1'
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
index f4f9c0496421d5e0c9c7a2545f6eedc36d5f9e06..370ea94200b9aa860af69ac360d3058553e8cb74 100644
--- a/tests/script/unique/account/pass_len.sim
+++ b/tests/script/unique/account/pass_len.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 $i = 0
 $dbPrefix = apdb
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
index f022380ac416b41b43de098d2c27a37bd7df0d24..63c3d49f43e0d41f64bb6e011b5071cd893ec3ef 100644
--- a/tests/script/unique/account/usage.sim
+++ b/tests/script/unique/account/usage.sim
@@ -1,6 +1,7 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 
 print =============== show accounts
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
index 789035cfcca728df07853f2aac6ec333adb926cb..2a647862252f6d00e20c95f60ef49a66adc3375e 100644
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 print =============== step1
 sql show users
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
index 918551fa66375291f0cdee31af2317a4ade76621..1163ac2e4be84b974a30997a38ab9cbb9db1c696 100644
--- a/tests/script/unique/account/user_len.sim
+++ b/tests/script/unique/account/user_len.sim
@@ -3,8 +3,8 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
-sql connect
 sleep 3000
+sql connect
 
 $i = 0
 $dbPrefix = lm_us_db
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 52199f046e1c44d15957cda38003c62215779a97..4b0a6cd0bf25f1ad4a279ab9150adf1f114b3b60 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -20,7 +20,7 @@ system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 1000
 
 print =============== prepare data
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
@@ -87,7 +87,7 @@ endi
 
 print ========== step1
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
 show1: 
@@ -98,12 +98,12 @@ show1:
 	endi
 	
 sql show dnodes
-print dnode1 freeVnodes $data3_192.168.0.1
-print dnode2 freeVnodes $data3_192.168.0.2
-if $data3_192.168.0.1 != 2 then
+print dnode1 openvnodes $data2_1
+print dnode2 openvnodes $data2_2
+if $data2_1 != 2 then
 	goto show1
 endi
-if $data3_192.168.0.2 != 2 then
+if $data2_2 != 2 then
 	goto show1
 endi
 
@@ -139,7 +139,7 @@ endi
 
 print ========== step2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 10000
 
 print ========== step3
@@ -154,20 +154,20 @@ show3:
 	endi
 	
 sql show dnodes
-print dnode1 freeVnodes $data3_192.168.0.1
-print dnode2 freeVnodes $data3_192.168.0.2
-print dnode3 freeVnodes $data3_192.168.0.3
-if $data3_192.168.0.1 != 2 then
+print dnode1 freeVnodes $data2_1
+print dnode2 freeVnodes $data2_2
+print dnode3 freeVnodes $data2_3
+if $data2_1 != 2 then
 	goto show3
 endi
-if $data3_192.168.0.2 != NULL then
+if $data2_2 != NULL then
 	goto show3
 endi
-if $data3_192.168.0.3 != 2 then
+if $data2_3 != 2 then
 	goto show3
 endi
 
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
@@ -211,16 +211,16 @@ show4:
 	endi
 	
 sql show dnodes
-print dnode1 freeVnodes $data3_192.168.0.1
-print dnode3 freeVnodes $data3_192.168.0.3
-if $data3_192.168.0.1 != 0 then
+print dnode1 freeVnodes $data2_1
+print dnode3 freeVnodes $data2_3
+if $data2_1 != 0 then
 	goto show4
 endi
-if $data3_192.168.0.3 != NULL then
+if $data2_3 != NULL then
 	goto show4
 endi
 
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
@@ -255,7 +255,7 @@ endi
 print ========== step5
 sql alter database db replica 2
 sql create dnode $hostname4
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 
 $x = 0
 show5: 
@@ -266,12 +266,12 @@ show5:
 	endi
 	
 sql show dnodes
-print dnode1 freeVnodes $data3_192.168.0.1
-print dnode4 freeVnodes $data3_192.168.0.4
-if $data3_192.168.0.1 != 0 then
+print dnode1 freeVnodes $data2_1
+print dnode4 freeVnodes $data2_4
+if $data2_1 != 0 then
 	goto show5
 endi
-if $data3_192.168.0.4 != 0 then
+if $data2_4 != 0 then
 	goto show5
 endi
 
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index 00995ba32c4e57f957557bf1ac72423244c75192..3015d07b6dfdca7cc67e1621c096d8238b063129 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -1,25 +1,32 @@
 system sh/stop_dnodes.sh
 
+$totalVnodes = 100
+$minVnodes = 48
+$maxVnodes = 52
+$maxTables = 4
+$totalRows = $totalVnodes * $maxTables
+
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel            -v 0
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode   -v 100
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v 256
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode   -v $maxTables
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v $totalVnodes
 system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000
 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000
 system sh/cfg.sh -n dnode1 -c maxShellConns       -v 100000
 system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 100000
 
 print ==========  prepare data
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect 
-sql create database db
+sql create database db blocks 2 cache 1 maxTables $maxTables
 sql use db
 
 print ==========  step1
 sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
 $x = 0
-while $x < 25600
+while $x < $totalRows
   $tb = t . $x
   sql create table $tb using mt tags( $x )
   sql insert into $tb values (now, $x ) 
@@ -28,16 +35,15 @@ endw
 
 print ========== step2
 sql select * from mt
-if $rows != 25600 then
+if $rows != $totalRows then
   return -1
 endi  
 
 sql select count(*) from mt
-if $data00 != 25600 then
+if $data00 != $totalRows then
   return -1
 endi  
 
-
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c walLevel            -v 0
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode   -v 100
@@ -49,7 +55,7 @@ system sh/cfg.sh -n dnode2 -c maxMgmtConnections  -v 100000
 
 print ==========  step2
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
 show3: 
@@ -60,23 +66,23 @@ show3:
 	endi
 	
 sql show dnodes
-print dnode1 freeVnodes $data3_192.168.0.1
-print dnode2 freeVnodes $data3_192.168.0.2
-if $data3_192.168.0.1 != 126 then
+print dnode1 openvnodes $data2_1
+print dnode2 openvnodes $data2_2
+if $data2_1 != $minVnodes then
 	goto show3
 endi
-if $data3_192.168.0.2 != 130 then
+if $data2_2 != $maxVnodes then
 	goto show3
 endi
 
 print ========== step4
 sql select * from mt
-if $rows != 25600 then
+if $rows != $totalRows then
   return -1
 endi  
 
 sql select count(*) from mt
-if $data00 != 25600 then
+if $data00 != $totalRows then
   return -1
 endi  
 
diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim
index 1fb414ec748a290db1bd6ec5987ab335f3aa1c20..590035c0f8afa38e57248e586ebb361e71b2da3f 100644
--- a/tests/script/unique/big/tcp.sim
+++ b/tests/script/unique/big/tcp.sim
@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c adminDebugFlag  -v 131
 system sh/cfg.sh -n dnode1 -c httpDebugFlag   -v 135
 system sh/cfg.sh -n dnode1 -c debugFlag       -v 131
 
-system sh/exec.sh -n dnode1 -s start
-
+system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 print ======================== dnode1 start
 
@@ -52,7 +52,7 @@ while $i < $tbNum
 endw 
 
 $i = 0
-while $i < 100
+while $i < 10
 	print =============== step3 $i
 	sql select count(*) from $mt
 	print ===> $data00 $data01
@@ -83,7 +83,7 @@ while $i < $tbNum
 endw 
 
 $i = 0
-while $i < 100
+while $i < 10
 	print =============== step5 $i
 	sql select count(*) from $mt where tgcol < 20200
 	print ===> $data00 $data01
diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim
index 99d91595735e5b71d480b9bb0514808e3c8d7c86..8c144dd0c44e23dc381ead7aa3ff32815965b6e1 100644
--- a/tests/script/unique/mnode/mgmt23.sim
+++ b/tests/script/unique/mnode/mgmt23.sim
@@ -59,7 +59,7 @@ endi
 if $dnode2Role != slave then
   return -1
 endi
-if $dnode3Role != NULL then
+if $dnode3Role != null then
   return -1
 endi
 
@@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
@@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim
index ba545f94797261c8f394128027cba86718e0b1cc..8c8eeba466c31ab6efabd00e129a78d13c13ecd3 100644
--- a/tests/script/unique/mnode/mgmt25.sim
+++ b/tests/script/unique/mnode/mgmt25.sim
@@ -59,7 +59,7 @@ endi
 if $dnode2Role != slave then
   return -1
 endi
-if $dnode3Role != NULL then
+if $dnode3Role != null then
   return -1
 endi
 
@@ -78,7 +78,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim
index e5ead5bb3915d950ce5cd9999867647f671a85a2..373a0abaed191075666085574dc013c3f1cb0721 100644
--- a/tests/script/unique/mnode/mgmt26.sim
+++ b/tests/script/unique/mnode/mgmt26.sim
@@ -59,7 +59,7 @@ endi
 if $dnode2Role != slave then
   return -1
 endi
-if $dnode3Role != NULL then
+if $dnode3Role != null then
   return -1
 endi
 
@@ -79,7 +79,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
@@ -106,7 +106,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim
index 36b7ba81394d6055305f7b7dabf6b504e140720c..e3a62a2d22cae72ef7a12d9f85dc5da1046a88a3 100644
--- a/tests/script/unique/mnode/mgmt33.sim
+++ b/tests/script/unique/mnode/mgmt33.sim
@@ -18,10 +18,10 @@ print dnode3 ==> $data3_3
 if $data2_1 != master then
   return -1
 endi
-if $data3_2 != NULL then
+if $data3_2 != null then
   return -1
 endi
-if $data3_3 != NULL then
+if $data3_3 != null then
   return -1
 endi
 
@@ -44,7 +44,7 @@ endi
 if $dnode2Role != slave then
   return -1
 endi
-if $dnode3Role != NULL then
+if $dnode3Role != null then
   return -1
 endi
 
@@ -86,7 +86,7 @@ print dnode3 ==> $dnode3Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
@@ -156,7 +156,7 @@ print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 
-if $dnode1Role != NULL then
+if $dnode1Role != null then
   return -1
 endi
 #if $dnode2Role != master then
diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim
index 1139daea1cccfb87962aebc3a9fec1c63f2cd53b..4409c825c8138420ab853a787b8d8041bf544584 100644
--- a/tests/script/unique/mnode/mgmt34.sim
+++ b/tests/script/unique/mnode/mgmt34.sim
@@ -22,10 +22,10 @@ print dnode3 ==> $data3_3
 if $data2_1 != master then
   return -1
 endi
-if $data3_2 != NULL then
+if $data3_2 != null then
   return -1
 endi
-if $data3_3 != NULL then
+if $data3_3 != null then
   return -1
 endi
 
@@ -50,10 +50,10 @@ endi
 if $dnode2Role != slave then
   return -1
 endi
-if $dnode3Role != NULL then
+if $dnode3Role != null then
   return -1
 endi
-if $dnode4Role != NULL then
+if $dnode4Role != null then
   return -1
 endi
 
@@ -81,7 +81,7 @@ endi
 if $dnode3Role != slave then
   return -1
 endi
-if $dnode4Role != NULL then
+if $dnode4Role != null then
   return -1
 endi
 
@@ -110,7 +110,7 @@ endi
 if $dnode3Role != slave then
   return -1
 endi
-if $dnode4Role != NULL then
+if $dnode4Role != null then
   return -1
 endi
 
@@ -131,7 +131,7 @@ print dnode4 ==> $dnode4Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
@@ -165,7 +165,7 @@ print dnode4 ==> $dnode4Role
 if $dnode1Role != master then
   return -1
 endi
-if $dnode2Role != NULL then
+if $dnode2Role != null then
   return -1
 endi
 if $dnode3Role != slave then
@@ -207,7 +207,7 @@ print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
 
-if $dnode1Role != NULL then
+if $dnode1Role != null then
   return -1
 endi
 if $dnode2Role != slave then