diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c
index d8dfcbe213304ad4f19a441a7781b2ed98970679..5cee1f30cda5984ee8cda49eac9c4790dafa4946 100644
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@@ -803,7 +803,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
     newCfg.daysToKeep2 = daysToKeep2;
   }
 
-  if (compression > 0 && compression != pDb->cfg.compression) {
+  if (compression >= 0 && compression != pDb->cfg.compression) {
     mTrace("db:%s, compression:%d change to %d", pDb->name, pDb->cfg.compression, compression);
     newCfg.compression = compression;
   }
@@ -823,7 +823,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
     }
   }
 
-  if (walLevel > 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) {
+  if (walLevel >= 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) {
     mError("db:%s, wal level %d should be between 0-2, origin:%d", pDb->name, walLevel, pDb->cfg.walLevel);
     terrno = TSDB_CODE_INVALID_OPTION;
   }
diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index d81720a1da41f52ce2aacf86b4cdd1a1722a6070..921cfee3d11fbaaff55cd945f18b3635fda9b0e1 100644
--- a/tests/script/general/alter/cached_schema_after_alter.sim
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -117,3 +117,5 @@ endi
 if $data12 != 2 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/general/alter/count.sim b/tests/script/general/alter/count.sim
index a6a2a13ef7345621833536917fbe46096f3829b1..a42fde74b7586d43904bb915a36eae11f05cccde 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -264,3 +264,4 @@ if $data00 != 31 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/general/alter/import.sim b/tests/script/general/alter/import.sim
index 1771d472984ea135eac7a9221f07cca6aaff0ded..61297655133772ef45d6a28d9f140f0d7b60395f 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -47,3 +47,5 @@ sql select count(b) from tb
 if $data00 != 5 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/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index 031cba09e0a74907b63fe75193a9a1f3befea09e..4246bdc18e05bb4f2bf66352d9b8b0e417855191 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -1148,3 +1148,5 @@ endi
 if $data78 != 11 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/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
index 1123fdb7903b466b3c79370a0ab02d6185cdf1b6..007060b7f061f5d50f7af13ddc9e1dfeaeddf8e2 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -681,3 +681,4 @@ if $data62 != NULL 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/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim
index 55763cf2d45ff106909292360da5adcc040e5aec..b346b3b2c039be2aed4b9f03b50944bf18a34004 100644
--- a/tests/script/general/alter/metrics.sim
+++ b/tests/script/general/alter/metrics.sim
@@ -781,3 +781,4 @@ if $rows != 0 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/general/alter/table.sim b/tests/script/general/alter/table.sim
index 9438bed8abd23b23dca2662c510651c4297562e2..c6402b45f748a20957f14e60b6ce1075f587ec22 100644
--- a/tests/script/general/alter/table.sim
+++ b/tests/script/general/alter/table.sim
@@ -684,3 +684,4 @@ if $rows != 0 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/general/alter/testSuite.sim b/tests/script/general/alter/testSuite.sim
index 33a926f7b2475b07d175f320a21e63267998948a..cfac68144c080593499159eec81325924e7f25e6 100644
--- a/tests/script/general/alter/testSuite.sim
+++ b/tests/script/general/alter/testSuite.sim
@@ -1,5 +1,5 @@
-run general/alter/count.sim
 run general/alter/cached_schema_after_alter.sim
+run general/alter/count.sim
 run general/alter/import.sim
 run general/alter/insert1.sim
 run general/alter/insert2.sim
diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim
index 2f7de7f1eb5facc97c488c5ff77df9548e3121fe..64170ec67ee7465dd75c87bca694048788ee183a 100644
--- a/tests/script/general/cache/new_metrics.sim
+++ b/tests/script/general/cache/new_metrics.sim
@@ -140,6 +140,4 @@ if $data04 != 10 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/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim
index 70f53ac69ea184544533b5be11a1265d056a64fc..dbd15b945f6cb855a67f2531547af8c95b874897 100644
--- a/tests/script/general/cache/restart_metrics.sim
+++ b/tests/script/general/cache/restart_metrics.sim
@@ -83,3 +83,4 @@ if $data02 != 3 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/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim
index 7ea4c24b4d86d0fb152177d51e5343cadcbfed5b..4e8bc92c1030df49acd01f1f5c4230a7578aa9ec 100644
--- a/tests/script/general/cache/restart_table.sim
+++ b/tests/script/general/cache/restart_table.sim
@@ -56,4 +56,4 @@ if $data01 != 1 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/general/cache/testSuite.sim b/tests/script/general/cache/testSuite.sim
index bffd4f9633453e949006e05e68a7bdd765563aa6..f09ece89b6574af1261d6127624a78a222b5fbd5 100644
--- a/tests/script/general/cache/testSuite.sim
+++ b/tests/script/general/cache/testSuite.sim
@@ -1,3 +1,3 @@
+run general/cache/new_metrics.sim
 run general/cache/restart_table.sim
 run general/cache/restart_metrics.sim
-run general/cache/new_metrics.sim
diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim
index f8fc85a109aa3e0d91059174ed12d1a5b0064be4..7bc62619f3b73aa26f413d12e0f12139cb494fff 100644
--- a/tests/script/general/column/commit.sim
+++ b/tests/script/general/column/commit.sim
@@ -151,4 +151,6 @@ if $data08 != 10 then
 endi
 if $data09 != 10 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim
index 23fbbfdbf57137ca46eb5c19828482cb561d9657..401a4ae54ea896e1ff72b17c58bf2275f9ce8cf0 100644
--- a/tests/script/general/column/metrics.sim
+++ b/tests/script/general/column/metrics.sim
@@ -215,3 +215,5 @@ endi
 if $data09 != 20 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/general/column/table.sim b/tests/script/general/column/table.sim
index af357eea8604751e399be110425931bde2da6cb3..8e9c44fc466457e682848cd93de5359c8a213781 100644
--- a/tests/script/general/column/table.sim
+++ b/tests/script/general/column/table.sim
@@ -211,3 +211,5 @@ endi
 if $data07 != 2.872281323 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/general/column/testSuite.sim b/tests/script/general/column/testSuite.sim
index 2a0b9efd451b35726e785ce447809141c12353c3..f60d197e95dd2285f2b5b155c0d361b8a28bd90e 100644
--- a/tests/script/general/column/testSuite.sim
+++ b/tests/script/general/column/testSuite.sim
@@ -1,4 +1,3 @@
-run general/column/table.sim
-run general/column/metrics.sim
-run general/column/stream.sim
 run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
index e2c3964e1bd036cebcbdd643d6b82d0a09275135..2c69b809d1ffda90a8ad2e112541b19769fecb3b 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/general/compress/commitlog.sim
@@ -1,9 +1,8 @@
 system sh/stop_dnodes.sh
 
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -88,9 +87,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 20000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -124,4 +123,4 @@ if $rows != $N 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/general/compress/compress.sim b/tests/script/general/compress/compress.sim
index 276fba9f8c94747469cd5a9d370ee40658988b1e..bc56227c745aeafdc3bfd4629cdda06cae6da9d5 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
@@ -1,9 +1,8 @@
 system sh/stop_dnodes.sh
 
-
 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 compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +118,4 @@ if $rows != $N 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/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
index 29d14c2c75b2bb49cc26aa442dfe4437e72dfb9b..c3b445c04cd72064082f9434a8cf7e9502e1057e 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
@@ -1,9 +1,8 @@
 system sh/stop_dnodes.sh
 
-
 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 compression -v 2
+system sh/cfg.sh -n dnode1 -c comp -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +82,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +118,4 @@ if $rows != $N 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/general/compress/testSuite.sim b/tests/script/general/compress/testSuite.sim
index 97c76aec155b225eeac04a3a5d0355cf7ed9de74..3573985c8a90be4cab0b5abeaa37dbae0b2eefdd 100644
--- a/tests/script/general/compress/testSuite.sim
+++ b/tests/script/general/compress/testSuite.sim
@@ -1,4 +1,4 @@
-run general/compress/compress.sim
-run general/compress/uncompress.sim
 run general/compress/commitlog.sim
 run general/compress/compress2.sim
+run general/compress/compress.sim
+run general/compress/uncompress.sim
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
index a7b8a95d524086a04188b29e4111c1ecba5953e9..8dde7fae342300ca584a1ac9759ee7421c6ceec2 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
@@ -1,9 +1,7 @@
 system sh/stop_dnodes.sh
-
-
 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 compression -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -83,9 +81,9 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 10000
+sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 10000
+sleep 3000
 
 print =============== step5
 
@@ -119,4 +117,4 @@ if $rows != $N 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/general/compute/avg.sim b/tests/script/general/compute/avg.sim
index 21dea700717ec09ece1308cb03715bd0e3e2dc0b..9a37363a6052e1098d2aa92221044a067b3abee7 100644
--- a/tests/script/general/compute/avg.sim
+++ b/tests/script/general/compute/avg.sim
@@ -153,4 +153,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim
index 241f775f34a2aeccf32913e6045e0e55527cf4fa..592f87651e118c0c7509cfcab26bbad4d9873047 100644
--- a/tests/script/general/compute/bottom.sim
+++ b/tests/script/general/compute/bottom.sim
@@ -94,4 +94,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim
index bb087c0ffb61e5e2ce2fc6fbc8394ec2c2d079fa..aef30c8b6c9016c53619b17a8b50b6da136f69df 100644
--- a/tests/script/general/compute/count.sim
+++ b/tests/script/general/compute/count.sim
@@ -169,4 +169,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim
index 00f13963194650248e38919e44acb317f3aee69c..8a60cd00bc745180d6f5d910e34650091b6b8945 100644
--- a/tests/script/general/compute/diff.sim
+++ b/tests/script/general/compute/diff.sim
@@ -86,4 +86,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim
index ec23b2481b260f996c8a0ce0a578f80613def6dd..53b508ca6f99b2aaf9c26568ad0be3d583421dd9 100644
--- a/tests/script/general/compute/diff2.sim
+++ b/tests/script/general/compute/diff2.sim
@@ -153,3 +153,5 @@ print =============== clear
 #if $rows != 0 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/general/compute/first.sim b/tests/script/general/compute/first.sim
index 39acb444abc1d9fe51660f96c4d635e9cadc3728..80f4f53cdbe8f498345a5f68e542b9914163485e 100644
--- a/tests/script/general/compute/first.sim
+++ b/tests/script/general/compute/first.sim
@@ -155,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim
index f00d39bcefd19be1a3b8602ce6ba49f60a26aab0..26f40eda5ae78a3f49d1341c8aae25d549fdb52e 100644
--- a/tests/script/general/compute/interval.sim
+++ b/tests/script/general/compute/interval.sim
@@ -171,4 +171,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim
index 779d1f3691d647fb48ea8cc33a659e3efbb8d04f..0e92bb6d456c92b8158faa59aa18d2bef82995e9 100644
--- a/tests/script/general/compute/last.sim
+++ b/tests/script/general/compute/last.sim
@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim
index ebafa2baf503aaa5cea7ecd4f40ed64eb4047791..bbadd849cb48c8dff494a32e9d47abd5ca96dea3 100644
--- a/tests/script/general/compute/leastsquare.sim
+++ b/tests/script/general/compute/leastsquare.sim
@@ -96,3 +96,5 @@ sql show databases
 if $rows != 0 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/general/compute/max.sim b/tests/script/general/compute/max.sim
index 5a907398387ee5bb7848723638c9c3b68b75d75e..4fc760d66d1391e2b92ffc2fb01d00b4a0136c07 100644
--- a/tests/script/general/compute/max.sim
+++ b/tests/script/general/compute/max.sim
@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim
index d87ca1ae9b07a92fafe3feef7aaa13c402381c68..82a22b642e3f8f912eadb2a525c4fa1d38a788b3 100644
--- a/tests/script/general/compute/min.sim
+++ b/tests/script/general/compute/min.sim
@@ -155,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim
index df9d009f34c9861a624da5e502aa861af0713ea5..cde95ca77f2ba741581a5ea82554b2b5112f662b 100644
--- a/tests/script/general/compute/null.sim
+++ b/tests/script/general/compute/null.sim
@@ -222,4 +222,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim
index 5d3f40a6de73a0d44f59abff55b3de7a939afe7f..dd309c378943b69e87ea622bbdae133e7899209f 100644
--- a/tests/script/general/compute/percentile.sim
+++ b/tests/script/general/compute/percentile.sim
@@ -112,3 +112,5 @@ sql show databases
 if $rows != 0 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/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim
index 4eaba1460551d0d76880933ec11a5ceae67305d6..7cea8726a9ed3d3d8215c97e368df623bb0a1c30 100644
--- a/tests/script/general/compute/stddev.sim
+++ b/tests/script/general/compute/stddev.sim
@@ -93,4 +93,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim
index 79c7bc0762d83999ff4d2ccc76e11cc8ef705417..d05fe8930ecb882a14bd831e27925994179c888c 100644
--- a/tests/script/general/compute/sum.sim
+++ b/tests/script/general/compute/sum.sim
@@ -154,4 +154,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/testSuite.sim b/tests/script/general/compute/testSuite.sim
index 5539e08a9dd4980fa189d9eb6e9e3df2e828386a..6cd6badaeec40e6581c127cdf9328de70021a38d 100644
--- a/tests/script/general/compute/testSuite.sim
+++ b/tests/script/general/compute/testSuite.sim
@@ -1,16 +1,16 @@
-run general/compute/count.sim
 run general/compute/avg.sim
-run general/compute/sum.sim
-run general/compute/min.sim
-run general/compute/max.sim
-run general/compute/first.sim
-run general/compute/last.sim
-run general/compute/stddev.sim
-run general/compute/leastsquare.sim
-run general/compute/top.sim
 run general/compute/bottom.sim
-run general/compute/percentile.sim
+run general/compute/count.sim
 run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
 run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
 run general/compute/null.sim
-run general/compute/diff2.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim
index 8f3797b67802e34bc655ae336ab40c1e8f4880cb..14b3b328a07e46759a17e206f1f3bc5d733e1c16 100644
--- a/tests/script/general/compute/top.sim
+++ b/tests/script/general/compute/top.sim
@@ -94,4 +94,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
index 893d2040a970942b074f08228661ae2c12266529..2cac8b8fa882e10befcb6d6602665373cef1e8f6 100644
--- a/tests/script/general/db/testSuite.sim
+++ b/tests/script/general/db/testSuite.sim
@@ -7,7 +7,7 @@ run general/db/basic5.sim
 run general/db/delete_reuse1.sim
 run general/db/delete_reuse2.sim
 run general/db/delete_reusevnode.sim
-#run general/db/delete_reusevnode2.sim
+run general/db/delete_reusevnode2.sim
 run general/db/delete_writing1.sim
 run general/db/delete_writing2.sim
 run general/db/len.sim
diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim
index dff0e6250cd61d3b0601f5707704be146a574593..28506b7cb82456ce424be5052a1f41269dcd56a3 100644
--- a/tests/script/general/field/2.sim
+++ b/tests/script/general/field/2.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bt_db
-$tbPrefix = fi_bt_tb
-$mtPrefix = fi_bt_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -233,6 +231,8 @@ if $data00 != 100 then
   return -1
 endi
 
+print sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
+
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
 if $data00 != 100 then 
@@ -292,4 +292,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim
index 05fed074284f823d04b414559fb8fbacf8bb1b9f..453f4968bfe1be218886bf958aaab44a287ba914 100644
--- a/tests/script/general/field/3.sim
+++ b/tests/script/general/field/3.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_3_db
-$tbPrefix = fi_3_tb
-$mtPrefix = fi_3_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -518,4 +516,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim
index ad84124b7d93adc732f82be0708535234d02cd7c..243424724fa8a487f8b8ea5394014c5913b097de 100644
--- a/tests/script/general/field/4.sim
+++ b/tests/script/general/field/4.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_4_db
-$tbPrefix = fi_4_tb
-$mtPrefix = fi_4_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -708,4 +706,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim
index 63fec1f16935e8c1fdb0119d536b3556b9eb3787..ca1543b54bf83ee40b077e2542e43e7e5c8e4c03 100644
--- a/tests/script/general/field/5.sim
+++ b/tests/script/general/field/5.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_5_db
-$tbPrefix = fi_5_tb
-$mtPrefix = fi_5_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -831,4 +829,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim
index 409c2e53c3e31cc11d04110fb1ae278216ea479e..23223e5c1502105b5df13f9d9cad5ad12b08944c 100644
--- a/tests/script/general/field/6.sim
+++ b/tests/script/general/field/6.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_6_db
-$tbPrefix = fi_6_tb
-$mtPrefix = fi_6_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -986,4 +984,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim
index e355cb31615f28ee77326f8fb4a58779cf98bebb..5cca73595c9159c8da8cea31e24471814f8f9771 100644
--- a/tests/script/general/field/bigint.sim
+++ b/tests/script/general/field/bigint.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bi_db
-$tbPrefix = fi_bi_tb
-$mtPrefix = fi_bi_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim
index 3ac43760975fcd6ec9aa0a1fd0006c5a0b6e5a7b..8bf1c84b93f54be6a0bd9267abdf05d695cdc6d4 100644
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/general/field/binary.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_by_db
-$tbPrefix = fi_by_tb
-$mtPrefix = fi_by_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -81,4 +79,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim
index 8a1a7172259c351a3b46ecddf9e47ccdb3868527..4528f79bc79ddb9fb6c2eeeb54c13384eec7df99 100644
--- a/tests/script/general/field/bool.sim
+++ b/tests/script/general/field/bool.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_bo_db
-$tbPrefix = fi_bo_tb
-$mtPrefix = fi_bo_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -158,4 +156,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim
index 2de34ad5b6b4de0450a80fbe600c38311baa9ea1..40650cb9bdbc3908892a6e6ee1958fa62c90d6bb 100644
--- a/tests/script/general/field/double.sim
+++ b/tests/script/general/field/double.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_do_db
-$tbPrefix = fi_do_tb
-$mtPrefix = fi_do_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim
index 443a721340960e3173bde2cc274c71a02ef243ff..0ead9fb48a424e5d2c5d2ff3b69a6ecc21fbf540 100644
--- a/tests/script/general/field/float.sim
+++ b/tests/script/general/field/float.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_fl_db
-$tbPrefix = fi_fl_tb
-$mtPrefix = fi_fl_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim
index 4ab10056713e69db01d4360a7473c592b4a88cbf..a095dc2176ad75c0123c7dcc9a1e0a5a1c75d75f 100644
--- a/tests/script/general/field/int.sim
+++ b/tests/script/general/field/int.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_in_db
-$tbPrefix = fi_in_tb
-$mtPrefix = fi_in_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim
index 6d710614f2ea0077e39db749607229fed9ac0386..8540608e96aacfe50dc346a0bf4217f8c38db7b7 100644
--- a/tests/script/general/field/single.sim
+++ b/tests/script/general/field/single.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_si_db
-$tbPrefix = fi_si_tb
-$mtPrefix = fi_si_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $rowNum = 20
 
 print =============== step1
@@ -215,4 +213,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim
index 37ddadb271f1726f7351bb7a6593a193f6b8264c..578de4ea442b87bea61f24db8c24b71efe0e2621 100644
--- a/tests/script/general/field/smallint.sim
+++ b/tests/script/general/field/smallint.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -9,9 +7,9 @@ sleep 3000
 sql connect
 print ======================== dnode1 start
 
-$dbPrefix = fi_sm_db
-$tbPrefix = fi_sm_tb
-$mtPrefix = fi_sm_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -157,4 +155,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim
index 65775c1145e3a9809aaf131546528d6caeea0502..f132b427025d4c706cdcf09b4ede678e36fbaaf8 100644
--- a/tests/script/general/field/tinyint.sim
+++ b/tests/script/general/field/tinyint.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
@@ -10,9 +8,9 @@ sql connect
 
 print ======================== dnode1 start
 
-$dbPrefix = fi_ti_db
-$tbPrefix = fi_ti_tb
-$mtPrefix = fi_ti_mt
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
 $tbNum = 10
 $rowNum = 20
 $totalNum = 200
@@ -158,4 +156,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/testSuite.sim b/tests/script/general/http/testSuite.sim
index 3337f4fc97eb68b3ff852b879ee3288b4342f5af..d91e9f452d17d4f46f82123b7e6911c094681971 100644
--- a/tests/script/general/http/testSuite.sim
+++ b/tests/script/general/http/testSuite.sim
@@ -4,5 +4,5 @@ run general/http/restful_limit.sim
 run general/http/restful_full.sim
 run general/http/prepare.sim
 run general/http/telegraf.sim
-#run general/http/grafana_bug.sim
-#run general/http/grafana.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim
index 0623405c2f9f33352f6858f90da036baefc7835a..2b72d55cdaf76ed07cd3519053010c1186ccd28b 100644
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/general/import/basic.sim
@@ -1,10 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -50,14 +44,14 @@ endi
 print ================= step2
 sql insert into tb values(1564641708000, 8000)
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
 sql insert into tb values(1564641720000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 
@@ -76,7 +70,7 @@ sql insert into tb values(1564641714000, 14000)
 sql insert into tb values(1564641725000, 25000)
 sql insert into tb values(1564641740000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+if $rows != 8 then 
   return -1
 endi
 
@@ -87,7 +81,7 @@ sql import into tb values(1564641723000, 23000)
 sql import into tb values(1564641734000, 34000)
 sql import into tb values(1564641750000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 13 then 
   return -1
 endi
 
@@ -98,7 +92,7 @@ sql import into tb values(1564641723001, 23001)
 sql import into tb values(1564641734001, 34001)
 sql import into tb values(1564641750001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+if $rows != 18 then 
   return -1
 endi
 
@@ -108,28 +102,28 @@ sql insert into tb values(1564641714002, 14002)
 sql insert into tb values(1564641725002, 25002)
 sql insert into tb values(1564641900000, 200000)
 sql select * from tb;
-if $rows != 17 then 
+if $rows != 22 then 
   return -1
 endi
 
 print ================= step9 only insert last one
 sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
 print ================= step10
 sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
 print ================= step11
 sql import into tb values(1564642400000, 700000)
 sql select * from tb;
-if $rows != 20 then
+if $rows != 25 then
   return -1
 endi
 
@@ -137,7 +131,7 @@ print ================= step12
 sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
 sql select * from tb;
 print rows=> $rows
-if $rows != 21 then
+if $rows != 26 then
   return -1
 endi
 
@@ -145,7 +139,8 @@ print ================= step13
 sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
 sql select * from tb;
 print rows=> $rows
-if $rows != 23 then
+if $rows != 28 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/general/import/commit.sim b/tests/script/general/import/commit.sim
index ce52b9496f675b9605ad26a074d9414ca9dd648e..64833fcd61677fd3e6a2ac5ee4f2e46b662ce4a7 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -1,10 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -93,6 +87,4 @@ if $rows != 12 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/general/import/large.sim b/tests/script/general/import/large.sim
index 6a0bbf28d277e22a11a7ea645e156b1fcbe8b14a..6f6889a226d8abdc9b2f1ffa026b57a0a55ae314 100644
--- a/tests/script/general/import/large.sim
+++ b/tests/script/general/import/large.sim
@@ -1,10 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -25,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -99,4 +93,6 @@ while $i < 1000
   $i = $i + 1
 endw 
 
-print ================= step2
\ No newline at end of file
+print ================= step2
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
index 14e27ffa503d6a8e46af0e5b14a19e005cf3939a..b2b7291623a7a18320c78b36a14e20d940eedab6 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/general/import/replica1.sim
@@ -1,10 +1,5 @@
 system sh/stop_dnodes.sh
 
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -25,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
 
-system sh/cfg.sh -n dnode1 -c commitlog -v 0
-system sh/cfg.sh -n dnode2 -c commitlog -v 0
-system sh/cfg.sh -n dnode3 -c commitlog -v 0
-system sh/cfg.sh -n dnode4 -c commitlog -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
 
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
@@ -40,53 +35,59 @@ sql use ir1db
 sql create table tb(ts timestamp, i int)
 
 print ================= step1
-sql import into tb values(now+10000a, 10000)
+sql import into tb values(1520000010000, 10000)
 sql select * from tb;
+print $rows
 if $rows != 1 then 
   return -1
 endi
 
 print ================= step2
-sql insert into tb values(now+8000a, 8000)
+sql insert into tb values(1520000008000, 8000)
+print $rows
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
-sql insert into tb values(now+20000a, 20000)
+sql insert into tb values(1520000020000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+print $rows
+if $rows != 3 then 
   return -1
 endi
 
 print ================= step4
-sql import into tb values(now+8000a, 9000)
-sql import into tb values(now+15000a, 15000)
-sql import into tb values(now+30000a, 30000)
+sql import into tb values(1520000009000, 9000)
+sql import into tb values(1520000015000, 15000)
+sql import into tb values(1520000030000, 30000)
 sql select * from tb;
-if $rows != 5 then 
+print $rows
+if $rows != 6 then 
   return -1
 endi
 
 print ================= step5
-sql insert into tb values(now+8000a, 8000)
-sql insert into tb values(now+14000a, 14000)
-sql insert into tb values(now+25000a, 25000)
-sql insert into tb values(now+40000a, 40000)
+sql insert into tb values(1520000008000, 8000)
+sql insert into tb values(1520000014000, 14000)
+sql insert into tb values(1520000025000, 25000)
+sql insert into tb values(1520000040000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+print $rows
+if $rows != 9 then 
   return -1
 endi
 
 print ================= step6
-sql import into tb values(now+7000a, 7000)
-sql import into tb values(now+12000a, 12000)
-sql import into tb values(now+23000a, 23000)
-sql import into tb values(now+34000a, 34000)
-sql import into tb values(now+50000a, 50000)
+sql import into tb values(1520000007000, 7000)
+sql import into tb values(1520000012000, 12000)
+sql import into tb values(1520000023000, 23000)
+sql import into tb values(1520000034000, 34000)
+sql import into tb values(1520000050000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+print $rows
+if $rows != 14 then 
   return -1
 endi
 
@@ -98,46 +99,63 @@ sleep 5000
 
 sql use ir1db
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 14 then 
   return -1
 endi
 
 print ================= step7
-sql import into tb values(now+7001a, 7001)
-sql import into tb values(now+12001a, 12001)
-sql import into tb values(now+23001a, 23001)
-sql import into tb values(now+34001a, 34001)
-sql import into tb values(now+50001a, 50001)
+sql import into tb values(1520000007001, 7001)
+sql import into tb values(1520000012001, 12001)
+sql import into tb values(1520000023001, 23001)
+sql import into tb values(1520000034001, 34001)
+sql import into tb values(1520000050001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+print $rows
+if $rows != 19 then 
   return -1
 endi
 
 print ================= step8
-sql insert into tb values(now+8002a, 8002)
-sql insert into tb values(now+14002a, 14002)
-sql insert into tb values(now+25002a, 25002)
-sql insert into tb values(now+200000a, 60000)
+sql insert into tb values(1520000008002, 8002)
+sql insert into tb values(1520000014002, 14002)
+sql insert into tb values(1520000025002, 25002)
+sql insert into tb values(1520000060000, 60000)
 sql select * from tb;
-if $rows != 17 then 
+print $rows
+if $rows != 24 then 
   return -1
 endi
 
 print ================= step9
-sql import into tb values(now-30d, 7003)
-sql import into tb values(now-20d, 34003)
-sql import into tb values(now-10d, 34003)
-sql import into tb values(now-5d, 34003)
-sql import into tb values(now+1m, 50001)
-sql import into tb values(now+2m, 50001)
-sql import into tb values(now+3m, 50001)
-sql import into tb values(now+4m, 50002)
-sql import into tb values(now+5m, 50003)
-sql import into tb values(now+6m, 50004)
-sql import into tb values(now+7m, 50001)
-sql import into tb values(now+8m, 500051)
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 7003)
+sql import into tb values(1518272000000, 34003)
+sql import into tb values(1519136000000, 34003)
+sql import into tb values(1519568000000, 34003)
+sql import into tb values(1519654400000, 50001)
+sql import into tb values(1519827200000, 50001)
+sql import into tb values(1520345600000, 50001)
+sql import into tb values(1520691200000, 50002)
+sql import into tb values(1520864000000, 50003)
+sql import into tb values(1521900800000, 50004)
+sql import into tb values(1523110400000, 50001)
+sql import into tb values(1521382400000, 500051)
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
@@ -149,23 +167,44 @@ sleep 5000
 
 sql use ir1db
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
 print ================= step11
-sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
 sql select * from tb;
-if $rows != 34 then 
+if $rows != 41 then 
   return -1
 endi
 
-sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+print ================= step12
+#1520000000000
+#sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003)
 sql select * from tb;
-if $rows != 43 then 
+print $rows
+if $rows != 50 then 
   return -1
 endi
 
 
+print ================= step14
+#1520000000000
+#sql import into tb values(now-48d, 34003)
+#sql import into tb values(now-38d, 50001)
+#sql import into tb values(now-28d, 50001)
+
+sql import into tb values(1515852800001, 34003)
+sql import into tb values(1516716800000, 50001)
+sql import into tb values(1517580800000, 50001)
 
+sql select * from tb;
+if $rows != 50 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/general/import/testSuite.sim b/tests/script/general/import/testSuite.sim
index d340d90d6645a462be6511532fa9f08c8c629dbb..9157410ea562ed924725013b81cac2fd78946c75 100644
--- a/tests/script/general/import/testSuite.sim
+++ b/tests/script/general/import/testSuite.sim
@@ -1,4 +1,4 @@
 run general/import/basic.sim
-#run general/import/commit.sim
+run general/import/commit.sim
 run general/import/large.sim
 run general/import/replica1.sim
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim
index 0bc4c123b84ee30a1f0341f383c72edb1f4b67ca..6f9752087d9d5d099703dd851b55305d65726784 100644
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/general/insert/tcp.sim
@@ -28,10 +28,4 @@ endw
 
 sql select * from tb
 
-sql drop database $db
-sql show databases
-if $rows != 0 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/general/insert/testSuite.sim b/tests/script/general/insert/testSuite.sim
index 72e4c057c1c198c6579eeab1ace7282795bb253d..da44167be57a6a2083c49c73a02999ba647f513e 100644
--- a/tests/script/general/insert/testSuite.sim
+++ b/tests/script/general/insert/testSuite.sim
@@ -1,5 +1,5 @@
 run general/insert/basic.sim
-#run general/insert/insert_drop.sim
+run general/insert/insert_drop.sim
 run general/insert/query_block1_memory.sim
 run general/insert/query_block2_memory.sim
 run general/insert/query_block1_file.sim
diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim
index a23a117ac20ead141b2c23b9202446593b35c744..0865719a147c2ecde394af0b5758b73909b1d53a 100644
--- a/tests/script/general/metrics/disk.sim
+++ b/tests/script/general/metrics/disk.sim
@@ -194,4 +194,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim
index 52448a4002b1a544a55329e4b19af4d0a584abcf..b9367469b3b4c2a99bc3c7618f5100471aeda641 100644
--- a/tests/script/general/metrics/metrics.sim
+++ b/tests/script/general/metrics/metrics.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 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 numOfTotalVnodes -v 4
@@ -135,3 +133,5 @@ sql show databases
 if $rows != 0 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/general/metrics/values.sim b/tests/script/general/metrics/values.sim
index efabc67722080f345ffb55117722ec2531637fc8..f524eee4119801fda2604fa7b07e3dce491562e5 100644
--- a/tests/script/general/metrics/values.sim
+++ b/tests/script/general/metrics/values.sim
@@ -102,25 +102,4 @@ if $rows != 100 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/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim
index 5d4a9f7f5be0bdf25415bff7eb3e3d51e50349a9..73be7a1195739c10deed1dc9d840e8f436bae009 100644
--- a/tests/script/general/metrics/vnode3.sim
+++ b/tests/script/general/metrics/vnode3.sim
@@ -175,4 +175,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim
index 6768c75dd7ac2d1bee6d18421d0701f30ee5756f..d6cc88b36a6bb695a34eab889f52bdcb525017fb 100644
--- a/tests/script/general/table/testSuite.sim
+++ b/tests/script/general/table/testSuite.sim
@@ -11,17 +11,17 @@ run general/table/column_value.sim
 run general/table/column2.sim
 run general/table/date.sim
 run general/table/db.table.sim
-#run general/table/delete_reuse1.sim
-#run general/table/delete_reuse2.sim
-#run general/table/delete_writing.sim
-#run general/table/describe.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
 run general/table/double.sim
-#run general/table/fill.sim
+run general/table/fill.sim
 run general/table/float.sim
 run general/table/int.sim
 run general/table/limit.sim
 run general/table/smallint.sim
-#run general/table/table_len.sim
+run general/table/table_len.sim
 run general/table/table.sim
 run general/table/tinyint.sim
 run general/table/vgroup.sim
diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim
index e2a503ce8bfa612856b039a96ae28b0ed990b1d4..4b3104fe1bf591b69e4cc8837df9007ed2e815a5 100644
--- a/tests/script/general/tag/3.sim
+++ b/tests/script/general/tag/3.sim
@@ -1,13 +1,10 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
 sql connect
-sql reset query cache
 
 print ======================== dnode1 start
 
@@ -521,3 +518,5 @@ sql show databases
 if $rows != 0 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/general/tag/4.sim b/tests/script/general/tag/4.sim
index 93c422bb31f08dde504cb137800141c64ac63449..120ef4e4e3ba4dd5446eff7143d2dd605374fa5d 100644
--- a/tests/script/general/tag/4.sim
+++ b/tests/script/general/tag/4.sim
@@ -711,3 +711,5 @@ sql show databases
 if $rows != 0 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/general/tag/5.sim b/tests/script/general/tag/5.sim
index 949c9c257ba7e68ac9ca7bb9a1b57cb108c22e0f..efe88b36503c5161179602afea18fcf6ea1a106a 100644
--- a/tests/script/general/tag/5.sim
+++ b/tests/script/general/tag/5.sim
@@ -834,3 +834,5 @@ sql show databases
 if $rows != 0 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/general/tag/6.sim b/tests/script/general/tag/6.sim
index de5542c635123ba42bd80f95a7f1f67ba0e31972..d5f0a6c4af9b13420a07d4140a456f2b5112acd2 100644
--- a/tests/script/general/tag/6.sim
+++ b/tests/script/general/tag/6.sim
@@ -989,3 +989,5 @@ sql show databases
 if $rows != 0 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/general/tag/add.sim b/tests/script/general/tag/add.sim
index 3d4323c4017b23741dbdf3bdc604b7830bc58782..69fd909dcf33f0a268fa306955c4beae5da792b6 100644
--- a/tests/script/general/tag/add.sim
+++ b/tests/script/general/tag/add.sim
@@ -851,4 +851,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim
index 736c30607f53a5163860a519c29a123c8cc36477..4fa22d3995617ec16d9ad85d5ef9a11bfe65ac06 100644
--- a/tests/script/general/tag/bigint.sim
+++ b/tests/script/general/tag/bigint.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim
index f57f5cc996cb4f90800a1fbd5b63f2c70547c68b..7c6f95b1ef785d5621d02e51e28fe96f7fe37f6c 100644
--- a/tests/script/general/tag/binary.sim
+++ b/tests/script/general/tag/binary.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim
index 5f001e028e265bfa3f9617992662b9632b93a33b..077ec85b523d9fa20a90c1ec8f0e9309dd2b3ea2 100644
--- a/tests/script/general/tag/binary_binary.sim
+++ b/tests/script/general/tag/binary_binary.sim
@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim
index 82d6cd14bf88063f1dd058095b6d348048e6028e..540eaf123872d3cbdba15fd3556866802992be9a 100644
--- a/tests/script/general/tag/bool.sim
+++ b/tests/script/general/tag/bool.sim
@@ -236,4 +236,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim
index c836dd227b76ea84e40da9bcf492d80ce8bb7ba5..a3f99e25ad8f62562cc70f3776e99397a815ae2f 100644
--- a/tests/script/general/tag/bool_binary.sim
+++ b/tests/script/general/tag/bool_binary.sim
@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim
index 86a16fde9bdadeaa896ffd34bbd081dfd6cf26ae..1a2726dbaa684e2c39a37f1ef29827b480fc3617 100644
--- a/tests/script/general/tag/bool_int.sim
+++ b/tests/script/general/tag/bool_int.sim
@@ -322,4 +322,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim
index 1b7e643a21c5fc56321ee9d6d18992e5f1f82496..1577514765e9a851b659d3a1568d99857a2e65c6 100644
--- a/tests/script/general/tag/change.sim
+++ b/tests/script/general/tag/change.sim
@@ -511,4 +511,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim
index e9b89b7b46c2b783d7075b2238f7b7f7f4d0c4e4..4a36e832f1bf6f373a81318e483ee02ee6bf2e01 100644
--- a/tests/script/general/tag/column.sim
+++ b/tests/script/general/tag/column.sim
@@ -91,4 +91,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim
index 021f49a9986fd612f2b2e23a6da606cf779ff88d..94dc13f0cff9b6dc62024ce4f6138fe4f5f38311 100644
--- a/tests/script/general/tag/commit.sim
+++ b/tests/script/general/tag/commit.sim
@@ -1180,4 +1180,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim
index 3d4ecf8bc34ba461d33ffa2d37c72432c1262349..c0cdbe87dc57f9efd761c0a163cee756b2bb466c 100644
--- a/tests/script/general/tag/create.sim
+++ b/tests/script/general/tag/create.sim
@@ -598,3 +598,5 @@ print $data00 $data01 $data02
 if $data02 != 12345 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/general/tag/delete.sim b/tests/script/general/tag/delete.sim
index 6dd6254d3201728c3c66cc15aae50ad1ed03d905..3454ce9d822b74bf24430f227217b4e545adcdba 100644
--- a/tests/script/general/tag/delete.sim
+++ b/tests/script/general/tag/delete.sim
@@ -823,4 +823,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim
index 47c94d8ae61b1c3018bb95c014b8107807a7c00b..13dcb1fc72b7c760c325a09fe0589ce0a211e23a 100644
--- a/tests/script/general/tag/double.sim
+++ b/tests/script/general/tag/double.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim
index b10e8a03727a7740e407881e0e22650ef8587118..4388f029f9c84b707ae564962e398c098b4b5529 100644
--- a/tests/script/general/tag/filter.sim
+++ b/tests/script/general/tag/filter.sim
@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
@@ -146,3 +144,5 @@ sql show databases
 if $rows != 0 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/general/tag/float.sim b/tests/script/general/tag/float.sim
index 4f86eec3389852d3bb8078a5105b54c80e9e1427..2352bbaf2e8a2c5e27158332434d59be62e8d9d6 100644
--- a/tests/script/general/tag/float.sim
+++ b/tests/script/general/tag/float.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim
index d0dea47cb1a7c190c8b6a02d69209377e18ce07b..a93df9a57afabdd59d22e1de44504db1bdbdaef4 100644
--- a/tests/script/general/tag/int.sim
+++ b/tests/script/general/tag/int.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim
index 234780d6d57d4deca010e280c99e740289c7878c..d3795006680a771190930b446c2390a5240dcb01 100644
--- a/tests/script/general/tag/int_binary.sim
+++ b/tests/script/general/tag/int_binary.sim
@@ -306,4 +306,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim
index bfa3ed7f72ebf565420d2b3e75ad528c77da0cf0..510c4f92d0810f6a675f0b0180081c0bf552584e 100644
--- a/tests/script/general/tag/int_float.sim
+++ b/tests/script/general/tag/int_float.sim
@@ -322,4 +322,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim
index bc7b8ac53416cdf556122f0edd693593fffca875..917844c3e3272c9983d7bd24caeebdf92e821273 100644
--- a/tests/script/general/tag/set.sim
+++ b/tests/script/general/tag/set.sim
@@ -455,4 +455,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim
index 4ca945947788b76cfbf080aaf997146962a4626d..18b0957b1517560bca651ef9fbd4cc9325e94a22 100644
--- a/tests/script/general/tag/smallint.sim
+++ b/tests/script/general/tag/smallint.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/testSuite.sim b/tests/script/general/tag/testSuite.sim
index 10874262d64b56112e6d3c4436f97f1c43ac437d..45356efac1daa4f8f5fae06b8aad8c7b139bc9a0 100644
--- a/tests/script/general/tag/testSuite.sim
+++ b/tests/script/general/tag/testSuite.sim
@@ -1,25 +1,25 @@
-run general/tag/filter.sim
-run general/tag/column.sim
-run general/tag/bool.sim
-run general/tag/smallint.sim
-run general/tag/tinyint.sim
-run general/tag/int.sim
-run general/tag/bigint.sim
-run general/tag/float.sim
-run general/tag/double.sim
-run general/tag/binary.sim
-run general/tag/bool_int.sim
-run general/tag/bool_binary.sim
-run general/tag/int_float.sim
-run general/tag/int_binary.sim
-run general/tag/binary_binary.sim
 run general/tag/3.sim
 run general/tag/4.sim
 run general/tag/5.sim
 run general/tag/6.sim
+run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+run general/tag/change.sim
+run general/tag/column.sim
+run general/tag/commit.sim
 run general/tag/create.sim
 run general/tag/delete.sim
-run general/tag/change.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
 run general/tag/set.sim
-run general/tag/add.sim
-run general/tag/commit.sim
\ No newline at end of file
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim
index 9e339a352c9cdb91b603c05b6b9b337827c5b156..f104f8df04356487999bd4232db70b9ea067dd73 100644
--- a/tests/script/general/tag/tinyint.sim
+++ b/tests/script/general/tag/tinyint.sim
@@ -239,4 +239,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/testSuite.sim b/tests/script/general/user/testSuite.sim
index 16bc96f4dcb081ec816fd50e43bdbe82422f5abe..b4bf52cfd1dfd13e99306110a63a19e6dc8bb230 100644
--- a/tests/script/general/user/testSuite.sim
+++ b/tests/script/general/user/testSuite.sim
@@ -1,5 +1,5 @@
 run general/user/basic1.sim
-#run general/user/monitor.sim
+run general/user/monitor.sim
 run general/user/pass_alter.sim
 run general/user/pass_len.sim
 run general/user/user_create.sim
diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim
index 1b96b8c36d2513cbf32657c753e5690fabaea445..2a03ccea19a46771a89755791c7b696f547d296c 100644
--- a/tests/script/general/vector/metrics_field.sim
+++ b/tests/script/general/vector/metrics_field.sim
@@ -618,4 +618,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim
index 992ce6e18949d9d5812d68cdec0e847c9986b8ec..96b2f6a7a013d4bd323de7db9c39dfcf433421b2 100644
--- a/tests/script/general/vector/metrics_mix.sim
+++ b/tests/script/general/vector/metrics_mix.sim
@@ -618,4 +618,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim
index 8e3833f7a43d0324022c60a5db595b63aaeb99aa..824aa6f22e45153b295f2b42afe9ebcf45d00642 100644
--- a/tests/script/general/vector/metrics_query.sim
+++ b/tests/script/general/vector/metrics_query.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim
index 81f15a194fd0c9f135ff91af4b3402ad6a25db27..e7575cc9df5e9c0c49af8ec21ed629c73cd7a0e6 100644
--- a/tests/script/general/vector/metrics_tag.sim
+++ b/tests/script/general/vector/metrics_tag.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim
index f7e78ae5211c1650a9058e27938a16f4aee1228f..bbcabfd1b7f81dc65f8c61f4c46d09bd18d1c35b 100644
--- a/tests/script/general/vector/metrics_time.sim
+++ b/tests/script/general/vector/metrics_time.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim
index 3a607b24105f537f51ce42b6e8e89618c1450b65..105f210950960ac8dc75dd38e22af1fb8dd5b060 100644
--- a/tests/script/general/vector/multi.sim
+++ b/tests/script/general/vector/multi.sim
@@ -206,10 +206,11 @@ sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc  -x step
   return -1
 step74:
 
-
 print =============== clear
 sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim
index 8eff3e1fb194c3426d27aa4ff2fcf07601b24054..2292d6f44ae43286d619a560320c31b3085ea267 100644
--- a/tests/script/general/vector/single.sim
+++ b/tests/script/general/vector/single.sim
@@ -298,4 +298,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim
index 96adf54f1d282f6246a372160ae5dfa8207870c2..a9d6910f4da4c1258d7a2efdf592352e7d043349 100644
--- a/tests/script/general/vector/table_field.sim
+++ b/tests/script/general/vector/table_field.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim
index c994697ff2a4f3202cc48b78e86a4d5275e41d81..a6c4dc92da51d312c2a65561ecb8fcbf4737239a 100644
--- a/tests/script/general/vector/table_mix.sim
+++ b/tests/script/general/vector/table_mix.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim
index ce3acc1d660993337bbbad46378e1fea0ea6435d..812229afc4acaf7cb8515c3cbb483bad302b8ac0 100644
--- a/tests/script/general/vector/table_query.sim
+++ b/tests/script/general/vector/table_query.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim
index 3c2ff183ed078d04157fb6a6477675bd7ab01c53..a83195beba2fe0dec305098407ec872aa47e8535 100644
--- a/tests/script/general/vector/table_time.sim
+++ b/tests/script/general/vector/table_time.sim
@@ -614,4 +614,6 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/testSuite.sim b/tests/script/general/vector/testSuite.sim
index e660fd90a971203323e8b1db829ceac64d6747dd..f0b9fef9912699f5e8ed86b322c30db2d4210c83 100644
--- a/tests/script/general/vector/testSuite.sim
+++ b/tests/script/general/vector/testSuite.sim
@@ -1,12 +1,11 @@
-run general/vector/single.sim
-run general/vector/multi.sim
-run general/vector/table_query.sim
-run general/vector/table_time.sim
-run general/vector/table_field.sim
-run general/vector/table_mix.sim
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
 run general/vector/metrics_query.sim
 run general/vector/metrics_tag.sim
 run general/vector/metrics_time.sim
-run general/vector/metrics_field.sim
-run general/vector/metrics_mix.sim
-
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index c5f8cdcd06dd80bfdcbae8d437f2a85d30020bfa..1a9862e4ede76ca6e9045cdd16e7f2b52a6900c8 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -6,20 +6,43 @@ cd ../../../debug; cmake ..
 #cd ../../../debug; make clean
 cd ../../../debug; make
 
-
-#########  general   #########  
-
-#alter
-
-#cache
-#./test.sh -f general/cache/restart_table.sim
+#./test.sh -f general/alter/cached_schema_after_alter.sim
+#./test.sh -f general/alter/count.sim
+#./test.sh -f general/alter/import.sim
+#./test.sh -f general/alter/insert1.sim
+#./test.sh -f general/alter/insert2.sim
+#./test.sh -f general/alter/metrics.sim
+#./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/new_metrics.sim
-
-
-#column
-#compress
-#compute
+./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
+
+./test.sh -f general/compress/commitlog.sim
+./test.sh -f general/compress/compress.sim
+./test.sh -f general/compress/compress2.sim
+./test.sh -f general/compress/uncompress.sim
+
+#./test.sh -f general/compute/avg.sim
+./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
+#./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
+#./test.sh -f general/compute/max.sim
+#./test.sh -f general/compute/min.sim
+./test.sh -f general/compute/null.sim
+./test.sh -f general/compute/percentile.sim
+./test.sh -f general/compute/stddev.sim
+#./test.sh -f general/compute/sum.sim
+./test.sh -f general/compute/top.sim
 
 ./test.sh -f general/db/basic.sim
 ./test.sh -f general/db/basic1.sim
@@ -37,7 +60,17 @@ cd ../../../debug; make
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
 
-#field
+#./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/http/restful_insert.sim
@@ -48,8 +81,10 @@ cd ../../../debug; make
 #./test.sh -f general/http/grafana_bug.sim
 #./test.sh -f general/http/grafana.sim
 
-
-#import
+./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
 
 ./test.sh -f general/insert/basic.sim
 #./test.sh -f general/insert/insert_drop.sim
@@ -61,8 +96,11 @@ cd ../../../debug; make
 ./test.sh -f general/insert/query_multi_file.sim
 ./test.sh -f general/insert/tcp.sim
 
+#./test.sh -f general/metrics/disk.sim
+#./test.sh -f general/metrics/metrics.sim
+#./test.sh -f general/metrics/values.sim
+#./test.sh -f general/metrics/vnode3.sim
 
-#metrics
 #parser
 #stream
 
@@ -94,19 +132,52 @@ cd ../../../debug; make
 ./test.sh -f general/table/tinyint.sim
 ./test.sh -f general/table/vgroup.sim
 
-
-#tag
+#./test.sh -f general/tag/3.sim
+#./test.sh -f general/tag/4.sim
+#./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/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/change.sim
+#./test.sh -f general/tag/column.sim
+#./test.sh -f general/tag/commit.sim
+#./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/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/set.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
 
-#vector
+#./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/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
 
-#########  unique   #########  
+#################################  
 
 ./test.sh -u -f unique/account/account_create.sim
 ./test.sh -u -f unique/account/account_delete.sim
@@ -120,7 +191,9 @@ cd ../../../debug; make
 ./test.sh -u -f unique/account/user_create.sim
 ./test.sh -u -f unique/account/user_len.sim
 
-#big
+#./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/cluster/balance1.sim
 ./test.sh -u -f unique/cluster/balance2.sim
@@ -129,6 +202,9 @@ cd ../../../debug; make
 
 ./test.sh -u -f unique/column/replica3.sim
 
+#./test.sh -u -f unique/db/commit.sim
+#./test.sh -u -f unique/db/delete.sim
+#./test.sh -u -f unique/db/delete_part.sim
 ./test.sh -u -f unique/db/replica_add12.sim
 ./test.sh -u -f unique/db/replica_add13.sim
 ./test.sh -u -f unique/db/replica_add23.sim
@@ -143,12 +219,24 @@ cd ../../../debug; make
 ./test.sh -u -f unique/dnode/balancex.sim
 ./test.sh -u -f unique/dnode/offline1.sim
 ./test.sh -u -f unique/dnode/offline2.sim
+#./test.sh -u -f unique/dnode/remove1.sim
+#./test.sh -u -f unique/dnode/remove2.sim
+#./test.sh -u -f unique/dnode/vnode_clean.sim
 
 ./test.sh -u -f unique/http/admin.sim
+./test.sh -u -f unique/http/opentsdb.sim
 
-#import
+#./test.sh -u -f unique/import/replica2.sim
+#./test.sh -u -f unique/import/replica3.sim
 
-#metrics
+#./test.sh -u -f unique/metrics/balance_replica1.sim
+#./test.sh -u -f unique/metrics/dnode2_stop.sim
+#./test.sh -u -f unique/metrics/dnode2.sim
+#./test.sh -u -f unique/metrics/dnode3.sim
+#./test.sh -u -f unique/metrics/replica2_dnode4.sim
+#./test.sh -u -f unique/metrics/replica2_vnode3.sim
+#./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
@@ -157,10 +245,21 @@ cd ../../../debug; make
 ./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
 
 #stream
 
-#table
+./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/replica3_basic.sim
\ No newline at end of file
+#./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
+#./test.sh -u -f unique/vnode/replica3_vgroup.sim
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 4eb5772811b526a10f6eb64930c1026a51393551..52199f046e1c44d15957cda38003c62215779a97 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -304,3 +304,12 @@ print select count(*) from mt $data00 expect $rowNum
 if $data00 != $totalNum then
   goto show5
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index 738fd0704def9871b7f850b0970968a5421e570c..00995ba32c4e57f957557bf1ac72423244c75192 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -79,3 +79,12 @@ sql select count(*) from mt
 if $data00 != 25600 then
   return -1
 endi  
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim
index 795744961730cfa61a32df9a4fb9650d8212f494..1fb414ec748a290db1bd6ec5987ab335f3aa1c20 100644
--- a/tests/script/unique/big/tcp.sim
+++ b/tests/script/unique/big/tcp.sim
@@ -103,5 +103,12 @@ while $i < 100
 	
 	$i = $i + 1
 endw 
-system sh/stop_dnodes.sh
-sleep 10000
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/big/testSuite.sim b/tests/script/unique/big/testSuite.sim
index 5881d1fb67471f69da76e05b191259fab8692181..2cead5626a5f5dd53ffbc30a0a8502ee70da25d1 100644
--- a/tests/script/unique/big/testSuite.sim
+++ b/tests/script/unique/big/testSuite.sim
@@ -1,3 +1,3 @@
-#run unique/big/balance.sim
-#run unique/big/maxvnodes.sim
-#run unique/big/tcp.sim
+run unique/big/balance.sim
+run unique/big/maxvnodes.sim
+run unique/big/tcp.sim
diff --git a/tests/script/unique/cluster/testSuite.sim b/tests/script/unique/cluster/testSuite.sim
index 6ef8a0dd565a11c5a447f43703d34d266f97ceb1..9657558c12a0a47441127f64a25541ebc15390e6 100644
--- a/tests/script/unique/cluster/testSuite.sim
+++ b/tests/script/unique/cluster/testSuite.sim
@@ -1,4 +1,4 @@
 run unique/cluster/balance1.sim
 run unique/cluster/balance2.sim
 run unique/cluster/balance3.sim
-#run unique/cluster/cache.sim
+run unique/cluster/cache.sim
diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim
index 0e58c6ed76e72957dd5e1731c91855702776d417..648cd8db2fe592b2405017d9d850c76ffeefb117 100644
--- a/tests/script/unique/db/commit.sim
+++ b/tests/script/unique/db/commit.sim
@@ -1,7 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -118,3 +115,11 @@ if $data01 != 40 then
 	return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index 5100b93dcdde560eadb868b166e77750e88314d2..e222db8d70fff0dfb17d2731a346557b5ddb0b8e 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -44,3 +44,12 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi 
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
index 3ed4f5d7534595d1701446df585b601efef29a6e..3d1cc5dc633dd143d5cef3397a8e7b234cadaf5f 100644
--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -1,9 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -77,3 +72,11 @@ begin:
 	
 goto begin
   
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/testSuite.sim b/tests/script/unique/db/testSuite.sim
index 49188504262736820daf9eee7f8e17b85fdfbee5..adc1883a71c32d0b18e17a994f32e7ddd9577e9b 100644
--- a/tests/script/unique/db/testSuite.sim
+++ b/tests/script/unique/db/testSuite.sim
@@ -1,5 +1,5 @@
-#run unique/db/commit.sim
-#run unique/db/delete.sim
+run unique/db/commit.sim
+run unique/db/delete.sim
 run unique/db/replica_add12.sim
 run unique/db/replica_add13.sim
 run unique/db/replica_add23.sim
@@ -7,4 +7,4 @@ run unique/db/replica_reduce21.sim
 run unique/db/replica_reduce32.sim
 run unique/db/replica_reduce31.sim
 run unique/db/replica_part.sim
-#run unique/db/delete_part.sim
+run unique/db/delete_part.sim
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
index d6837d7dfef9bd9a497d21658f50150b4b823f6c..545c28a4ea14cd3c1d29a4d19a3011158f522850 100644
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
@@ -194,3 +194,12 @@ endi
 if $data41 != 35 then
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index 66ebd9772205e7dd1ad6f08e0432862570abd455..972b77a35d240cd3f491c156daa310e8279780c2 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -140,3 +140,12 @@ endi
 if $data41 != 35 then
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/testSuite.sim b/tests/script/unique/dnode/testSuite.sim
index 9921cbf378e149b07f64caf217bbe3242a5838b4..ecd43cc224136deaa615fb04f0e6c21fa8ee50d5 100644
--- a/tests/script/unique/dnode/testSuite.sim
+++ b/tests/script/unique/dnode/testSuite.sim
@@ -4,6 +4,6 @@ run unique/dnode/balance3.sim
 run unique/dnode/balancex.sim
 run unique/dnode/offline1.sim
 run unique/dnode/offline2.sim
-#run unique/dnode/remove1.sim
-#run unique/dnode/remove2.sim
-#run unique/dnode/vnode_clean.sim
+run unique/dnode/remove1.sim
+run unique/dnode/remove2.sim
+run unique/dnode/vnode_clean.sim
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
index 55abdab2b04af84a7333fcc59f1dc5a231833555..da34c7bc9b3b26f0a6bad497ae02ea253b97bb7a 100644
--- a/tests/script/unique/dnode/vnode_clean.sim
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -302,3 +302,11 @@ if $data41 != 45 then
   return -1
 endi
 
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
index 1c09dac5b681c1a4c2331db98db61394f9e4a49a..914838361ae8dddcddf5d5e2cf21fcd31fb020cb 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
@@ -234,4 +234,13 @@ system_content curl -u root:taosdata -d  'select count(*) from db.sys_cpu_d_bbb'
 print $system_content
 if $system_content != @{"status":"succ","head":["count(*)"],"data":[[8]],"rows":1}@ then
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/testSuite.sim b/tests/script/unique/http/testSuite.sim
index d4a6b1f5f5c7e677c081126cad91647190d30a82..3a9753e744b84bfea28e40e8b3554cb82d2ebb40 100644
--- a/tests/script/unique/http/testSuite.sim
+++ b/tests/script/unique/http/testSuite.sim
@@ -1,2 +1,2 @@
 run unique/http/admin.sim
-#run general/http/opentsdb.sim
\ No newline at end of file
+run general/http/opentsdb.sim
\ No newline at end of file
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
index bab04bd21133ffc468046a2f104d6539c959b179..bcb4179c12b1b3f9045a4690e7ecaa5685aa1f1e 100644
--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
@@ -40,14 +40,16 @@ sql create table tb(ts timestamp, i int)
 print ================= step1
 sql import into tb values(1520000010000, 10000)
 sql select * from tb;
+print $rows
 if $rows != 1 then 
   return -1
 endi
 
 print ================= step2
 sql insert into tb values(1520000008000, 8000)
+print $rows
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -55,7 +57,7 @@ print ================= step3
 sql insert into tb values(1520000020000, 20000)
 sql select * from tb;
 print $rows
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 
@@ -64,7 +66,8 @@ sql import into tb values(1520000009000, 9000)
 sql import into tb values(1520000015000, 15000)
 sql import into tb values(1520000030000, 30000)
 sql select * from tb;
-if $rows != 5 then 
+print $rows
+if $rows != 6 then 
   return -1
 endi
 
@@ -74,7 +77,8 @@ sql insert into tb values(1520000014000, 14000)
 sql insert into tb values(1520000025000, 25000)
 sql insert into tb values(1520000040000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+print $rows
+if $rows != 9 then 
   return -1
 endi
 
@@ -85,7 +89,8 @@ sql import into tb values(1520000023000, 23000)
 sql import into tb values(1520000034000, 34000)
 sql import into tb values(1520000050000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+print $rows
+if $rows != 14 then 
   return -1
 endi
 
@@ -95,7 +100,7 @@ sleep 5000
 system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 14 then 
   return -1
 endi
 
@@ -106,7 +111,8 @@ sql import into tb values(1520000023001, 23001)
 sql import into tb values(1520000034001, 34001)
 sql import into tb values(1520000050001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+print $rows
+if $rows != 19 then 
   return -1
 endi
 
@@ -116,7 +122,8 @@ sql insert into tb values(1520000014002, 14002)
 sql insert into tb values(1520000025002, 25002)
 sql insert into tb values(1520000060000, 60000)
 sql select * from tb;
-if $rows != 17 then 
+print $rows
+if $rows != 24 then 
   return -1
 endi
 
@@ -148,7 +155,8 @@ sql import into tb values(1521900800000, 50004)
 sql import into tb values(1523110400000, 50001)
 sql import into tb values(1521382400000, 500051)
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
@@ -158,7 +166,8 @@ sleep 5000
 system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
@@ -167,7 +176,7 @@ print ================= step11
 #sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
 sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
 sql select * from tb;
-if $rows != 34 then 
+if $rows != 41 then 
   return -1
 endi
 
@@ -176,7 +185,8 @@ print ================= step12
 #sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
 sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003)
 sql select * from tb;
-if $rows != 43 then 
+print $rows
+if $rows != 50 then 
   return -1
 endi
 
@@ -195,7 +205,7 @@ sql import into tb values(1516716800000, 50001)
 sql import into tb values(1517580800000, 50001)
 
 sql select * from tb;
-if $rows != 46 then 
+if $rows != 50 then 
   return -1
 endi
 
@@ -205,6 +215,15 @@ sleep 8000
 system sh/exec_up.sh -n dnode1 -s stop
 sleep 10000
 
-if $rows != 46 then 
+if $rows != 50 then 
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index c10f2da2f1ebe1592c5f828cbeadbcf1eadc6e5b..8d70d227a5033b837bb0faf3940b18f81ed0be38 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -41,53 +41,59 @@ sql use ir3db
 sql create table tb(ts timestamp, i int)
 
 print ================= step1
-sql import into tb values(now+10000a, 10000)
+sql import into tb values(1520000010000, 10000)
 sql select * from tb;
+print $rows
 if $rows != 1 then 
   return -1
 endi
 
 print ================= step2
-sql insert into tb values(now+8000a, 8000)
+sql insert into tb values(1520000008000, 8000)
+print $rows
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
-sql insert into tb values(now+20000a, 20000)
+sql insert into tb values(1520000020000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+print $rows
+if $rows != 3 then 
   return -1
 endi
 
 print ================= step4
-sql import into tb values(now+8000a, 9000)
-sql import into tb values(now+15000a, 15000)
-sql import into tb values(now+30000a, 30000)
+sql import into tb values(1520000009000, 9000)
+sql import into tb values(1520000015000, 15000)
+sql import into tb values(1520000030000, 30000)
 sql select * from tb;
-if $rows != 5 then 
+print $rows
+if $rows != 6 then 
   return -1
 endi
 
 print ================= step5
-sql insert into tb values(now+8000a, 8000)
-sql insert into tb values(now+14000a, 14000)
-sql insert into tb values(now+25000a, 25000)
-sql insert into tb values(now+40000a, 40000)
+sql insert into tb values(1520000008000, 8000)
+sql insert into tb values(1520000014000, 14000)
+sql insert into tb values(1520000025000, 25000)
+sql insert into tb values(1520000040000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+print $rows
+if $rows != 9 then 
   return -1
 endi
 
 print ================= step6
-sql import into tb values(now+7000a, 7000)
-sql import into tb values(now+12000a, 12000)
-sql import into tb values(now+23000a, 23000)
-sql import into tb values(now+34000a, 34000)
-sql import into tb values(now+50000a, 50000)
+sql import into tb values(1520000007000, 7000)
+sql import into tb values(1520000012000, 12000)
+sql import into tb values(1520000023000, 23000)
+sql import into tb values(1520000034000, 34000)
+sql import into tb values(1520000050000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+print $rows
+if $rows != 14 then 
   return -1
 endi
 
@@ -97,46 +103,63 @@ endi
 #system sh/exec_up.sh -n dnode1 -s start
 #sleep 5000
 #sql select * from tb;
-#if $rows != 11 then 
+#if $rows != 14 then 
 #  return -1
 #endi
 
 print ================= step7
-sql import into tb values(now+7001a, 7001)
-sql import into tb values(now+12001a, 12001)
-sql import into tb values(now+23001a, 23001)
-sql import into tb values(now+34001a, 34001)
-sql import into tb values(now+50001a, 50001)
+sql import into tb values(1520000007001, 7001)
+sql import into tb values(1520000012001, 12001)
+sql import into tb values(1520000023001, 23001)
+sql import into tb values(1520000034001, 34001)
+sql import into tb values(1520000050001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+print $rows
+if $rows != 19 then 
   return -1
 endi
 
 print ================= step8
-sql insert into tb values(now+8002a, 8002)
-sql insert into tb values(now+14002a, 14002)
-sql insert into tb values(now+25002a, 25002)
-sql insert into tb values(now+200000a, 60000)
+sql insert into tb values(1520000008002, 8002)
+sql insert into tb values(1520000014002, 14002)
+sql insert into tb values(1520000025002, 25002)
+sql insert into tb values(1520000060000, 60000)
 sql select * from tb;
-if $rows != 17 then 
+print $rows
+if $rows != 24 then 
   return -1
 endi
 
 print ================= step9
-sql import into tb values(now-30d, 7003)
-sql import into tb values(now-20d, 34003)
-sql import into tb values(now-10d, 34003)
-sql import into tb values(now-5d, 34003)
-sql import into tb values(now+1m, 50001)
-sql import into tb values(now+2m, 50001)
-sql import into tb values(now+6m, 50001)
-sql import into tb values(now+8m, 50002)
-sql import into tb values(now+10m, 50003)
-sql import into tb values(now+12m, 50004)
-sql import into tb values(now+14m, 50001)
-sql import into tb values(now+16m, 500051)
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 7003)
+sql import into tb values(1518272000000, 34003)
+sql import into tb values(1519136000000, 34003)
+sql import into tb values(1519568000000, 34003)
+sql import into tb values(1519654400000, 50001)
+sql import into tb values(1519827200000, 50001)
+sql import into tb values(1520345600000, 50001)
+sql import into tb values(1520691200000, 50002)
+sql import into tb values(1520864000000, 50003)
+sql import into tb values(1521900800000, 50004)
+sql import into tb values(1523110400000, 50001)
+sql import into tb values(1521382400000, 500051)
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
@@ -146,21 +169,27 @@ sleep 5000
 system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
-if $rows != 29 then 
+print $rows
+if $rows != 36 then 
   return -1
 endi
 
 print ================= step11
-sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
 sql select * from tb;
-if $rows != 34 then 
+if $rows != 41 then 
   return -1
 endi
 
 print ================= step12
-sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+#1520000000000
+#sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
+sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003)
 sql select * from tb;
-if $rows != 43 then 
+print $rows
+if $rows != 50 then 
   return -1
 endi
 
@@ -169,11 +198,17 @@ system sh/exec_up.sh -n dnode2 -s stop
 sleep 5000
 
 print ================= step14
-sql import into tb values(now-48d, 34003)
-sql import into tb values(now-38d, 50001)
-sql import into tb values(now-28d, 50001)
+#1520000000000
+#sql import into tb values(now-48d, 34003)
+#sql import into tb values(now-38d, 50001)
+#sql import into tb values(now-28d, 50001)
+
+sql import into tb values(1515852800001, 34003)
+sql import into tb values(1516716800000, 50001)
+sql import into tb values(1517580800000, 50001)
+
 sql select * from tb;
-if $rows != 46 then 
+if $rows != 50 then 
   return -1
 endi
 
@@ -183,6 +218,15 @@ sleep 8000
 system sh/exec_up.sh -n dnode3 -s stop
 sleep 3000
 
-if $rows != 46 then 
+if $rows != 50 then 
   return -1
 endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/import/testSuite.sim b/tests/script/unique/import/testSuite.sim
index df87ebf1be099abf712a131ad5bcc77998deb5d5..8be358ce17ee864538c47137630520cd3e69c337 100644
--- a/tests/script/unique/import/testSuite.sim
+++ b/tests/script/unique/import/testSuite.sim
@@ -1,2 +1,2 @@
-#run unique/import/replica2.sim
-#run unique/import/replica3.sim
\ No newline at end of file
+run unique/import/replica2.sim
+run unique/import/replica3.sim
\ No newline at end of file
diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim
index 3c4e8b06642a686c82cc712e9b1da41d73e42ae0..52bf558faa46395682e4bad34073f9e3f8fce286 100644
--- a/tests/script/unique/metrics/balance_replica1.sim
+++ b/tests/script/unique/metrics/balance_replica1.sim
@@ -136,4 +136,13 @@ sql select * from $mt
 print select * from $mt ==> $rows
 if $rows != 2600 then
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim
index 03a881ea49722bf93082a7c2910918d8f701fb95..cd76b39ba0dfaa49495c513bfcc2e7a748fd1ab1 100644
--- a/tests/script/unique/metrics/dnode2.sim
+++ b/tests/script/unique/metrics/dnode2.sim
@@ -195,4 +195,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim
index 58a46f9be9ab5b29155a4b0ffaedf0acbc3ae670..996482d11ebcfda55a1734bf233bd6e21ae8a44c 100644
--- a/tests/script/unique/metrics/dnode2_stop.sim
+++ b/tests/script/unique/metrics/dnode2_stop.sim
@@ -148,4 +148,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim
index 503ce6c47af5f40b432f15d7355394547c7c7d4d..3a5419dff4e579507d9b7eebb72d5bc6921a5c2d 100644
--- a/tests/script/unique/metrics/dnode3.sim
+++ b/tests/script/unique/metrics/dnode3.sim
@@ -224,4 +224,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim
index 7672b19ad9a5ebc7752d968e4d65a355ae399fb6..bedc895dd180dcb14a0adf34a91361ad01b0c723 100644
--- a/tests/script/unique/metrics/replica2_dnode4.sim
+++ b/tests/script/unique/metrics/replica2_dnode4.sim
@@ -215,4 +215,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim
index e7163e826decf5a3caab7e9d25cf5abd9d0f9d82..9a1d3477be9344d8451eec158e32209ca1b7b40d 100644
--- a/tests/script/unique/metrics/replica2_vnode3.sim
+++ b/tests/script/unique/metrics/replica2_vnode3.sim
@@ -192,4 +192,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim
index ef70bf5cc35ab91323a17b7891dc176226c2ec04..135e594cdcfdc5f9e85cab1aeb531f6349eafa81 100644
--- a/tests/script/unique/metrics/replica3_dnode6.sim
+++ b/tests/script/unique/metrics/replica3_dnode6.sim
@@ -245,4 +245,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim
index 50ad6d7584b1c2aec2e64b68da6d1a7b8b7c9189..ca147c1ef5af4b74462267a6554589e8da01f24c 100644
--- a/tests/script/unique/metrics/replica3_vnode3.sim
+++ b/tests/script/unique/metrics/replica3_vnode3.sim
@@ -214,4 +214,13 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/metrics/testSuite.sim b/tests/script/unique/metrics/testSuite.sim
index dd8ab53aa1de5fd93181169a991b6d8266914a9c..2e3ab31a44201f8e01fd70d8a0b2dffe8f51d7df 100644
--- a/tests/script/unique/metrics/testSuite.sim
+++ b/tests/script/unique/metrics/testSuite.sim
@@ -1,4 +1,8 @@
-#run unique/metrics/disk.sim
-#run unique/metrics/metrics.sim
-#run unique/metrics/values.sim
-#run unique/metrics/vnode3.sim
\ No newline at end of file
+run unique/metrics/balance_replica1.sim
+run unique/metrics/dnode2_stop.sim
+run unique/metrics/dnode2.sim
+run unique/metrics/dnode3.sim
+run unique/metrics/replica2_dnode4.sim
+run unique/metrics/replica2_vnode3.sim
+run unique/metrics/replica3_dnode6.sim
+run unique/metrics/replica3_vnode3.sim
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim
index aa0f4877fbcb7844050bd606e829b80bd990285d..56a4b305737cf0fb22a0aafbb7ae5357f425bd28 100644
--- a/tests/script/unique/mnode/mgmtr2.sim
+++ b/tests/script/unique/mnode/mgmtr2.sim
@@ -75,6 +75,11 @@ if $dnode3Role != NULL then
   return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/secondIp.sim b/tests/script/unique/mnode/secondIp.sim
index 71c2cdfb769d57c72d7b281589982d31ac2e5659..cfe75ffc842859d325ee589055513466f02ceb5c 100644
--- a/tests/script/unique/mnode/secondIp.sim
+++ b/tests/script/unique/mnode/secondIp.sim
@@ -34,6 +34,11 @@ if $data4_2 != 4 then
 	return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
-system sh/exec_up.sh -n dnode3 -s stop
\ No newline at end of file
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim
index f4a7b6fce443568bcd6b86ca0a0ca7de7bf8f79b..04cb03598ccd207b8790d3262f8271ecff743812 100644
--- a/tests/script/unique/table/delete_part.sim
+++ b/tests/script/unique/table/delete_part.sim
@@ -1,9 +1,4 @@
 system sh/stop_dnodes.sh
-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -79,4 +74,12 @@ begin:
 	$loop = $loop + 1
 	
 goto begin
-  
\ No newline at end of file
+  
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/table/testSuite.sim b/tests/script/unique/table/testSuite.sim
index 373f358ac8bdaaacfb769d3fb2e09b76b55a83ad..e0c0a1f2fabdaa079deb8b8db08db2095d1148fd 100644
--- a/tests/script/unique/table/testSuite.sim
+++ b/tests/script/unique/table/testSuite.sim
@@ -1 +1 @@
-#run unique/table/delete_part.sim
+run unique/table/delete_part.sim
diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim
index dae657166719b44753eb035b151b6f8a719155c3..29c9f72335fc01f156045396452e57f03ca3b590 100644
--- a/tests/script/unique/vnode/commit.sim
+++ b/tests/script/unique/vnode/commit.sim
@@ -148,4 +148,11 @@ if $rows != $remainRows then
   return -1
 endi
 
-system sh/exec_up.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
index 544f7d5b55870abe6e2357991c4e76721d8cc70f..0504207c2ed57ca6735a582c35740f68bc3df898 100644
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
@@ -113,4 +113,11 @@ if $x < 5 then
   goto loop
 endi
 
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim
index 8e18c3b9e77b868d00bbbfc05bff0021658ce88c..a0ea7085cb08922303dda014e3fd4322f6a71773 100644
--- a/tests/script/unique/vnode/replica2_basic.sim
+++ b/tests/script/unique/vnode/replica2_basic.sim
@@ -188,5 +188,12 @@ if $rows != $expect then
 endi
 
 print =================== step 12
-system sh/exec_up.sh -n dnode1 -s stop
-system sh/exec_up.sh -n dnode2 -s stop
+
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index cc1feecb07b2802146d8eb3789dbe1713d03e6b0..f7da1babb73914d58661a180b5cc7b3ddc8681ba 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -71,4 +71,11 @@ if $x < 5 then
   goto loop
 endi
 
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index 0ed16e0729edfd5ac1843b3886ef2ba50f9796a7..8c3ed902fb1508f4ce0d714f1455ad5546826957 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -80,4 +80,11 @@ if $x < 5 then
   goto loop
 endi
 
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
index 2763ed7c67c47496c3976cd9467b814d3f1e58f2..f63bf1783d60f67c81a51a104f737033ccceb237 100644
--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -61,5 +61,11 @@ endw
 #  return -1
 #endi
 
-
-
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/testSuite.sim b/tests/script/unique/vnode/testSuite.sim
index 9cf8ed0fc16239e1cc0010bdcbabd8f85e3afee2..46b01aaa45f2eef6fc37e523c724d6bab1244662 100644
--- a/tests/script/unique/vnode/testSuite.sim
+++ b/tests/script/unique/vnode/testSuite.sim
@@ -1,7 +1,8 @@
+run unique/vnode/commit.sim
+run unique/vnode/many.sim
+run unique/vnode/replica2_basic.sim
 run unique/vnode/replica2_basic2.sim
-#run unique/vnode/replica2_basic.sim
-#run unique/vnode/replica2_repeat.sim
+run unique/vnode/replica2_repeat.sim
 run unique/vnode/replica3_basic.sim
-#run unique/vnode/replica3_repeat.sim
-#run unique/vnode/commit.sim
-#run unique/vnode/many.sim
+run unique/vnode/replica3_repeat.sim
+run unique/vnode/replica3_vgroup.sim