diff --git a/tests/script/general/column/testSuite.sim b/tests/script/general/column/testSuite.sim
index 64eba8cc7e40914b5d62516ad8bc5efe5f7259e3..2a0b9efd451b35726e785ce447809141c12353c3 100644
--- a/tests/script/general/column/testSuite.sim
+++ b/tests/script/general/column/testSuite.sim
@@ -1,4 +1,4 @@
-run lite/column/table.sim
-run lite/column/metrics.sim
-run lite/column/stream.sim
-run lite/column/commit.sim
+run general/column/table.sim
+run general/column/metrics.sim
+run general/column/stream.sim
+run general/column/commit.sim
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
index 072eefd10cb0cb42a33bff57b2717b00e89c6dc6..e2c3964e1bd036cebcbdd643d6b82d0a09275135 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/general/compress/commitlog.sim
@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim
index 54fcc9acdec0af68d77ddc1a0b64ce30a3f8922e..276fba9f8c94747469cd5a9d370ee40658988b1e 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
index 76e9e66312e0c655fd815f921a281c0264137385..29d14c2c75b2bb49cc26aa442dfe4437e72dfb9b 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 2
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
index 2ff0144600ebb5544e4339d168629068b00ff065..a7b8a95d524086a04188b29e4111c1ecba5953e9 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/back_insert.sim b/tests/script/general/db/back_insert.sim
index 43831cca95b49218719c5172c3d2d96ad3500896..642df63ff280c6b2c41ef68e645b43fd0c998386 100644
--- a/tests/script/general/db/back_insert.sim
+++ b/tests/script/general/db/back_insert.sim
@@ -1,6 +1,8 @@
 sql connect
 $x = 1
 begin:
+  sql reset query cache
+  sleep 1000 
   sql insert into db.tb values(now, $x ) -x begin  
   #print ===> insert successed $x 
   $x = $x + 1   
diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim
index 655dc5e365bc83f89e1799adf747792b1666b015..8eb38ed1b108b34211386c621588cdea8cdc6ec5 100644
--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -1,9 +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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -78,6 +73,8 @@ sql insert into d1.t1 values(now, 2) -x step2
 step2:
 
 print ========= step3
+sql reset query cache
+sleep 1000
 sql create database d1 replica 1
 sql create table d1.t1 (ts timestamp, i int)
 sql insert into d1.t1 values(now, 2)
@@ -97,6 +94,8 @@ while $x < 20
   step4:
   
   sql create database d1 replica 1
+  sql reset query cache
+  sleep 1000
   sql create table d1.t1 (ts timestamp, i int)
   sql insert into d1.t1 values(now, $x )
   sql select * from d1.t1
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
index c424bee9ae548a93138559bfc090e5b6bb8881e1..d7483a1b589e61acea069e01053153ac5b636097 100644
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -1,9 +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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -79,6 +74,8 @@ step2:
 
 print ========= step3
 sql create database db1 replica 1
+sql reset query cache
+sleep 1000  
 sql create table db1.tb1 (ts timestamp, i int)
 sql insert into db1.tb1 values(now, 2)
 sql select * from db1.tb1
@@ -104,6 +101,9 @@ while $x < 20
   $db = db . $x 
   $tb = tb . $x
   
+  sql reset query cache
+  sleep 1000
+  
   sql create database $db replica 1
   sql use $db
   sql create table $tb (ts timestamp, i int)
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
index b12a60b4a6416020ff30d657fba92a94ff637af8..1328ae1a9c5af53a3e614a4ddf03d540e72e6321 100644
--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -5,19 +5,16 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1 
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 30
   $db = db . $i
   sql create database $db
   sql use $db
@@ -37,38 +34,32 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
 endi 
 
-
 system sh/stop_dnodes.sh
+sleep 3000
 
 system sh/deploy.sh -n dnode1 -i 1
-
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 10
   $db = db . $i
   sql create database $db maxTables 4
   sql use $db
 
-  sql create table st (ts timesetamp, i int) tags(j int);
+  sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i
   $tb = $tb . a
 
@@ -114,7 +105,6 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then
   return -1
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index 949c4d4b27e2d97108a9bc56ec099bff8152f8b8..b0032e137bf3e3dba249aa6e0eb815296a9bdca1 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -5,26 +5,19 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
+sql connect
 
 print ======== step1
 
-
 sql create database db maxTables 4;
 sql use db
 
-
 $tbPrefix = t
 $i = 0
-while $i < 1000
-
+while $i < 10
 
   sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i
diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim
index 85879253706ba691a7117ae6fa43a84a00fe0334..134a34bf955b19d996bfa91e2703e141f1eaddb3 100644
--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
@@ -1,9 +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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -39,7 +34,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
index a836a8988128afaa5a81758448163e266213e713..819c16751a4d6d3257cb44bc5efb0e7293caaebf 100644
--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -1,13 +1,11 @@
 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
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -27,7 +25,7 @@ sql create table db4.tb4 (ts timestamp, i int)
 sql insert into db4.tb4 values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
index 082dc4020af5d22b342cc5cebb1515b7ab7b4c67..893d2040a970942b074f08228661ae2c12266529 100644
--- a/tests/script/general/db/testSuite.sim
+++ b/tests/script/general/db/testSuite.sim
@@ -4,10 +4,12 @@ run general/db/basic2.sim
 run general/db/basic3.sim
 run general/db/basic4.sim
 run general/db/basic5.sim
-#run general/db/delete_reuse1.sim
-#run general/db/delete_reuse2.sim
-#run general/db/delete_writing1.sim
-#run general/db/delete_writing2.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_writing1.sim
+run general/db/delete_writing2.sim
 run general/db/len.sim
 run general/db/repeat.sim
 run general/db/tables.sim
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 6c36f0645d16f55260f75031eb3fd4994ec381b0..8bede7573a95677f11faf1043feaf7a20b3c178e 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -69,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
 
 print ====== test data created
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -79,5 +79,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index b923f61236cdc49dcf522ae0e95cf5e3e1051e18..c7c633d42266d364e0ae234ed632225f6806e0ef 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -56,7 +56,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index c3d0e05aea279489f146d6a305fe903a432966d6..5eb3b144a6f0fe405ffcacf3ed5571d9de820417 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -57,7 +57,7 @@ endw
 
 print ====== test data created
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,4 +67,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index a20160363a3b0cbcb642d61e8d75800bbcb6396b..8f00912a59f40106468e2c67cbbd8b9b669540db 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,5 +67,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index fa8a93871452693fe9332585e25c21e7ba69ef4f..040b6303de7eda3b997344f9cdde7055786f0eae 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index c6d41cb6a52db2d10913443d5859c27d78a042a5..a7764596400b3088f0d02e0bd8e0a36382a66f45 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index 5b1280d85856faa4e8e2935abce582b680d8bc8f..cc9334db36bec8a0faa64fc16ba7d0de8a1f199f 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index b69d24f6cabb54db24161bc3d346c895f3e40a2a..64f86edd28092bc816b663719c0ab153ff1181e0 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim
diff --git a/tests/script/general/parser/repeatAlter.sim b/tests/script/general/parser/repeatAlter.sim
index eec82f62c08b7a7bec8a425b88237e184fc29988..5f6a8e6a2a9cf81047ebd0050678b04b3fa2bd94 100644
--- a/tests/script/general/parser/repeatAlter.sim
+++ b/tests/script/general/parser/repeatAlter.sim
@@ -2,6 +2,6 @@ $i = 1
 $loops = 10
 while $i <= $loops
   print ====== repeat: $i
-  run lite/parser/alter.sim
+  run general/parser/alter.sim
   $i = $i + 1
 endw
diff --git a/tests/script/general/parser/repeatStream.sim b/tests/script/general/parser/repeatStream.sim
index 1301462c314566732bf08a576ee796e527aed14e..bd631e36a136ce792bef574428d94fe18b99b18e 100644
--- a/tests/script/general/parser/repeatStream.sim
+++ b/tests/script/general/parser/repeatStream.sim
@@ -2,6 +2,6 @@ $i = 1
 $repeats = 5
 while $i <= $repeats
   print ====== repeat: $i
-  run lite/parser/stream.sim
+  run general/parser/stream.sim
   $i = $i + 1
 endw
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 759599b7b12f09f3cd0d1c1e6bc2ff9cf2b60d44..5ee65e3b10c992681497606526afe064ab70237e 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -27,7 +27,7 @@ sql create table $tb1 using $stb tags( 1 )
 sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
 print ====== tables created
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -35,4 +35,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 13cec611a337d618c421482e9ea66d43aa8c16bb..7d2d3fc60b11e5b8d978030f430807fd6d598ba8 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -94,7 +94,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -104,4 +104,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 63f9ae64999e0bc875e19147b03d560680ca0248..7020cc8bb75b93cfee15a7c1fdd081a031c161c1 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -53,7 +53,7 @@ endw
 
 print ================== tables and data created
   
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -63,4 +63,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index 59298cc9f563f9f8c4875078f832235ef7716dce..548560e945efc8a47d2a54f3c2d17cc0574d8352 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -64,7 +64,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -72,4 +72,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index efc69531ed40d73b3ed137a6a77729d58d04a5b3..ce2b62fcc9a1aad21b41d8013cd9388929fbcdb3 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -54,7 +54,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
index cf8a6df831de1c3c9d02931ca1a269741019fdba..025f4cbdc0568ff2c5a821b17ca7aaa200870473 100644
--- a/tests/script/general/stream/metrics_del.sim
+++ b/tests/script/general/stream/metrics_del.sim
@@ -2,9 +2,6 @@ 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
index 2a77991569b7a928fc7a8984bb0e504b1685eb6e..914ecd848492dd837024417c2341d135cad25c1d 100644
--- a/tests/script/general/stream/stream_3.sim
+++ b/tests/script/general/stream/stream_3.sim
@@ -109,9 +109,6 @@ print =============== step7
 system sh/exec.sh -n dnode1 -s stop
 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 4000
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
index 389a3959b022a377215b24e237f053ec15e5510f..16dc8c2bb12caf1dd5e4c31523fe03667b8335dd 100644
--- a/tests/script/general/stream/table_del.sim
+++ b/tests/script/general/stream/table_del.sim
@@ -2,9 +2,6 @@ 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim
index bd4a316517faaefcecdffba674b29771768c7083..049b3037aa804f6c879e450b8f0f248c5a1ae884 100644
--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
@@ -40,7 +40,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/table/back_insert.sim
+run_back general/table/back_insert.sim
 sleep 1000
 
 print ======== step1 
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 795d8e080bd3be9cf54a1ee625f6116d01dd2d6d..e0590b50ef4b26e593f93e2572007cec52256fe5 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -9,16 +9,18 @@ cd ../../../debug; make
 
 #general
 
-./test.sh -f general/db/basic.sim
+./test.sh -f general//db/basic.sim
 ./test.sh -f general/db/basic1.sim
 ./test.sh -f general/db/basic2.sim
 ./test.sh -f general/db/basic3.sim
 ./test.sh -f general/db/basic4.sim
 ./test.sh -f general/db/basic5.sim
-#run general/db/delete_reuse1.sim
-#run general/db/delete_reuse2.sim
-#run general/db/delete_writing1.sim
-#run general/db/delete_writing2.sim
+./test.sh -f general/db/delete_reuse1.sim
+./test.sh -f general/db/delete_reuse2.sim
+./test.sh -f general/db/delete_reusevnode.sim
+#./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_writing1.sim
+./test.sh -f general/db/delete_writing2.sim
 ./test.sh -f general/db/len.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index f508b7e8740b08c9a6d5e67b5914e3362165b63e..5100b93dcdde560eadb868b166e77750e88314d2 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -15,9 +15,6 @@ system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start