diff --git a/tests/script/general/db/alter_tables_d2.sim b/tests/script/general/db/alter_tables_d2.sim
index 7e8d4e117abfd53dba5800f13abcd71a1e452c47..1fd24f9cec5b54c1be7531f24a3f590d94b28e38 100644
--- a/tests/script/general/db/alter_tables_d2.sim
+++ b/tests/script/general/db/alter_tables_d2.sim
@@ -375,7 +375,7 @@ endi
 print ============================ step11
 sql_error create table db.t400 using db.st tags(10)
 sql show db.tables
-if $rows != 50 then 
+if $rows != 80 then 
   return -1
 endi
 
@@ -427,7 +427,7 @@ sql insert into db.t418 values(now, 1)
 sql insert into db.t419 values(now, 1)
 
 sql show db.tables
-if $rows != 50 then 
+if $rows != 100 then 
   return -1
 endi
 
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 31b73dc89e971818c0b9c74c6121843f7962a883..5d76e69e10aad52416312f4425936cfd8ffa7731 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -44,7 +44,7 @@ cd ../../../debug; make
 ./test.sh -f general/compute/top.sim
 
 ./test.sh -f general/db/alter_option.sim
-#./test.sh -f general/db/alter_tables_d2.sim
+./test.sh -f general/db/alter_tables_d2.sim
 ./test.sh -f general/db/alter_tables_v1.sim
 ./test.sh -f general/db/alter_tables_v4.sim
 ./test.sh -f general/db/alter_vgroups.sim
@@ -65,7 +65,7 @@ cd ../../../debug; make
 ./test.sh -f general/db/len.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
-#liao ./test.sh -f general/db/vnodes.sim
+./test.sh -f general/db/vnodes.sim
 
 ./test.sh -f general/field/2.sim
 ./test.sh -f general/field/3.sim
@@ -91,10 +91,10 @@ cd ../../../debug; make
 ./test.sh -f general/import/basic.sim
 ./test.sh -f general/import/commit.sim
 ./test.sh -f general/import/large.sim
-#liao ./test.sh -f general/import/replica1.sim
+./test.sh -f general/import/replica1.sim
 
 ./test.sh -f general/insert/basic.sim
-#liao ./test.sh -f general/insert/insert_drop.sim
+./test.sh -f general/insert/insert_drop.sim
 ./test.sh -f general/insert/query_block1_memory.sim
 ./test.sh -f general/insert/query_block2_memory.sim
 ./test.sh -f general/insert/query_block1_file.sim
@@ -156,7 +156,7 @@ cd ../../../debug; make
 #./test.sh -f general/parser/bug.sim
 
 ./test.sh -f general/stable/disk.sim
-#liao ./test.sh -f general/stable/dnode3.sim
+./test.sh -f general/stable/dnode3.sim
 ./test.sh -f general/stable/metrics.sim
 ./test.sh -f general/stable/values.sim
 ./test.sh -f general/stable/vnode3.sim
@@ -247,8 +247,8 @@ cd ../../../debug; make
 ./test.sh -u -f unique/account/user_create.sim
 ./test.sh -u -f unique/account/user_len.sim
 
-#liao wait ./test.sh -u -f unique/big/balance.sim
-#liao wait ./test.sh -u -f unique/big/maxvnodes.sim
+./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
@@ -274,25 +274,25 @@ cd ../../../debug; make
 ./test.sh -u -f unique/dnode/balance3.sim
 ./test.sh -u -f unique/dnode/balancex.sim
 ./test.sh -u -f unique/dnode/offline1.sim
-#jeff ./test.sh -u -f unique/dnode/offline2.sim
+./test.sh -u -f unique/dnode/offline2.sim
 ./test.sh -u -f unique/dnode/remove1.sim
-#jeff ./test.sh -u -f unique/dnode/remove2.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
 
-#liao wait ./test.sh -u -f unique/import/replica2.sim
-#liao wait ./test.sh -u -f unique/import/replica3.sim
+./test.sh -u -f unique/import/replica2.sim
+./test.sh -u -f unique/import/replica3.sim
 
-#liao wait ./test.sh -u -f unique/stable/balance_replica1.sim
-#liao wait ./test.sh -u -f unique/stable/dnode2_stop.sim
-#liao wait ./test.sh -u -f unique/stable/dnode2.sim
-#liao wait ./test.sh -u -f unique/stable/dnode3.sim
-#liao wait ./test.sh -u -f unique/stable/replica2_dnode4.sim
-#liao wait ./test.sh -u -f unique/stable/replica2_vnode3.sim
-#liao wait ./test.sh -u -f unique/stable/replica3_dnode6.sim
-#liao wait ./test.sh -u -f unique/stable/replica3_vnode3.sim
+./test.sh -u -f unique/stable/balance_replica1.sim
+./test.sh -u -f unique/stable/dnode2_stop.sim
+./test.sh -u -f unique/stable/dnode2.sim
+./test.sh -u -f unique/stable/dnode3.sim
+./test.sh -u -f unique/stable/replica2_dnode4.sim
+./test.sh -u -f unique/stable/replica2_vnode3.sim
+./test.sh -u -f unique/stable/replica3_dnode6.sim
+./test.sh -u -f unique/stable/replica3_vnode3.sim
 
 ./test.sh -u -f unique/mnode/mgmt22.sim
 ./test.sh -u -f unique/mnode/mgmt23.sim
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 4b0a6cd0bf25f1ad4a279ab9150adf1f114b3b60..5259f415c88da90c99372ee2f81786d2743fddbc 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -93,7 +93,7 @@ $x = 0
 show1: 
 	$x = $x + 1
 	sleep 3000
-	if $x == 100 then 
+	if $x == 10 then 
 		return -1
 	endi
 	
@@ -107,6 +107,9 @@ if $data2_2 != 2 then
 	goto show1
 endi
 
+sql reset query cache
+sleep 1000
+
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
 if $data00 != $rowNum then
@@ -149,7 +152,7 @@ $x = 0
 show3: 
 	$x = $x + 1
 	sleep 3000
-	if $x == 100 then 
+	if $x == 10 then 
 		return -1
 	endi
 	
@@ -160,7 +163,7 @@ print dnode3 freeVnodes $data2_3
 if $data2_1 != 2 then
 	goto show3
 endi
-if $data2_2 != NULL then
+if $data2_2 != null then
 	goto show3
 endi
 if $data2_3 != 2 then
@@ -169,6 +172,9 @@ endi
 
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
+sql reset query cache
+sleep 1000
+
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
 if $data00 != $rowNum then
@@ -206,22 +212,25 @@ $x = 0
 show4: 
 	$x = $x + 1
 	sleep 3000
-	if $x == 100 then 
+	if $x == 10 then 
 		return -1
 	endi
 	
 sql show dnodes
 print dnode1 freeVnodes $data2_1
 print dnode3 freeVnodes $data2_3
-if $data2_1 != 0 then
+if $data2_1 != 4 then
 	goto show4
 endi
-if $data2_3 != NULL then
+if $data2_3 != null then
 	goto show4
 endi
 
 system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 
+sql reset query cache
+sleep 1000
+
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
 if $data00 != $rowNum then
@@ -253,28 +262,33 @@ if $data00 != $totalNum then
 endi
 
 print ========== step5
-sql alter database db replica 2
-sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
+sql create dnode $hostname4
+
+sleep 3000
+sql alter database db replica 2
 
 $x = 0
 show5: 
 	$x = $x + 1
 	sleep 3000
-	if $x == 100 then 
+	if $x == 10 then 
 		return -1
 	endi
 	
 sql show dnodes
 print dnode1 freeVnodes $data2_1
 print dnode4 freeVnodes $data2_4
-if $data2_1 != 0 then
+if $data2_1 != 4 then
 	goto show5
 endi
-if $data2_4 != 0 then
+if $data2_4 != 4 then
 	goto show5
 endi
 
+sql reset query cache
+sleep 1000
+
 sql select count(*) from t10
 print select count(*) from t10 $data00 expect $rowNum 
 if $data00 != $rowNum then
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index 2b56f51e599f72e9c2bf62251e82aff675722af1..f019ea607c6b1097e12e2aa788c8b69656ce23cf 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
 
-$totalVnodes = 100
-$minVnodes = 50
-$maxVnodes = 50
+$totalVnodes = 20
+$minVnodes = 10
+$maxVnodes = 10
 $maxTables = 4
 $totalRows = $totalVnodes * $maxTables
 
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index 73e7a31250f2b7ab09d38013cb0e09839c27cc19..42cb9e5485b2a65b67b29bccff99f73055056ed0 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -111,10 +111,10 @@ sql show dnodes
 print dnode1 openVnodes $data2_1
 print dnode2 openVnodes $data2_2
 print dnode3 openVnodes $data2_3
-if $data2_2 != null then
+if $data2_1 != 1 then
 	goto show4
 endi
-if $data2_1 != 1 then
+if $data2_2 != null then
 	goto show4
 endi
 if $data2_3 != 3 then
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
index bcb4179c12b1b3f9045a4690e7ecaa5685aa1f1e..70097a50221195b4f7bee6d7e5f54572faa509a3 100644
--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
@@ -20,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_up.sh -n dnode1 -s start
@@ -35,10 +35,10 @@ system sh/exec_up.sh -n dnode2 -s start
 
 sql create database ir2db replica 2 days 7
 sql use ir2db
-sql create table tb(ts timestamp, i int)
+sql create table tb(ts timestamp, i bigint)
 
 print ================= step1
-sql import into tb values(1520000010000, 10000)
+sql import into tb values(1520000010000, 1520000010000)
 sql select * from tb;
 print $rows
 if $rows != 1 then 
@@ -46,7 +46,7 @@ if $rows != 1 then
 endi
 
 print ================= step2
-sql insert into tb values(1520000008000, 8000)
+sql insert into tb values(1520000008000, 1520000008000)
 print $rows
 sql select * from tb;
 if $rows != 2 then 
@@ -54,7 +54,7 @@ if $rows != 2 then
 endi
 
 print ================= step3
-sql insert into tb values(1520000020000, 20000)
+sql insert into tb values(1520000020000, 1520000020000)
 sql select * from tb;
 print $rows
 if $rows != 3 then 
@@ -62,9 +62,9 @@ if $rows != 3 then
 endi
 
 print ================= step4
-sql import into tb values(1520000009000, 9000)
-sql import into tb values(1520000015000, 15000)
-sql import into tb values(1520000030000, 30000)
+sql import into tb values(1520000009000, 1520000009000)
+sql import into tb values(1520000015000, 1520000015000)
+sql import into tb values(1520000030000, 1520000030000)
 sql select * from tb;
 print $rows
 if $rows != 6 then 
@@ -72,10 +72,10 @@ if $rows != 6 then
 endi
 
 print ================= step5
-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 insert into tb values(1520000008000, 1520000008000)
+sql insert into tb values(1520000014000, 1520000014000)
+sql insert into tb values(1520000025000, 1520000025000)
+sql insert into tb values(1520000040000, 1520000040000)
 sql select * from tb;
 print $rows
 if $rows != 9 then 
@@ -83,11 +83,11 @@ if $rows != 9 then
 endi
 
 print ================= step6
-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 import into tb values(1520000007000, 1520000007000)
+sql import into tb values(1520000012000, 1520000012000)
+sql import into tb values(1520000023000, 1520000023000)
+sql import into tb values(1520000034000, 1520000034000)
+sql import into tb values(1520000050000, 1520000050000)
 sql select * from tb;
 print $rows
 if $rows != 14 then 
@@ -105,25 +105,26 @@ if $rows != 14 then
 endi
 
 print ================= step7
-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 import into tb values(1520000007001, 1520000007001)
+sql import into tb values(1520000012001, 1520000012001)
+sql import into tb values(1520000023001, 1520000023001)
+sql import into tb values(1520000034001, 1520000034001)
+sql import into tb values(1520000050001, 1520000050001)
 sql select * from tb;
 print $rows
-if $rows != 19 then 
+if $rows != 19 then
+  print expect 19, actual: $rows
   return -1
 endi
 
 print ================= step8
-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 insert into tb values(1520000008002, 1520000008002)
+sql insert into tb values(1520000014002, 1520000014002)
+sql insert into tb values(1520000025002, 1520000025002)
+sql insert into tb values(1520000060000, 1520000060000)
 sql select * from tb;
 print $rows
-if $rows != 24 then 
+if $rows != 23 then 
   return -1
 endi
 
@@ -142,21 +143,21 @@ print ================= step9
 #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 import into tb values(1517408000000, 1517408000000)
+sql import into tb values(1518272000000, 1518272000000)
+sql import into tb values(1519136000000, 1519136000000)
+sql import into tb values(1519568000000, 1519568000000)
+sql import into tb values(1519654400000, 1519654400000)
+sql import into tb values(1519827200000, 1519827200000)
+sql import into tb values(1520345600000, 1520345600000)
+sql import into tb values(1520691200000, 1520691200000)
+sql import into tb values(1520864000000, 1520864000000)
+sql import into tb values(1521900800000, 1521900800000)
+sql import into tb values(1523110400000, 1523110400000)
+sql import into tb values(1521382400000, 1521382400000)
 sql select * from tb;
 print $rows
-if $rows != 36 then 
+if $rows != 35 then 
   return -1
 endi
 
@@ -167,55 +168,57 @@ system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
 print $rows
-if $rows != 36 then 
+if $rows != 35 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(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
+sql import into tb values(1515680000000, 1) (1515852800000, 2) (1516025600000, 3) (1516198400000, 4) (1516371200000, 5)
 sql select * from tb;
-if $rows != 41 then 
+if $rows != 40 then 
   return -1
 endi
 
 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 import into tb values(now-19d, -19) (now-18d, -18) (now-17d, -17) (now-16d, -16) (now-15d, -15) (now-14d, -14) (now-13d, -13) (now-12d, -12) (now-11d, -11)
+sql import into tb values(1518358400000, 6) (1518444800000, 7) (1518531200000, 8) (1518617600000, 9) (1518704000000, 10) (1518790400000, 11) (1518876800000, 12) (1518963200000, 13) (1519049600000, 14)
 sql select * from tb;
 print $rows
-if $rows != 50 then 
+if $rows != 49 then 
   return -1
 endi
 
 print ================= step13
-system sh/exec_up.sh -n dnode2 -s stop 
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000
 
 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(now-48d, -48)
+#sql import into tb values(now-38d, -38)
+#sql import into tb values(now-28d, -28)
 
-sql import into tb values(1515852800001, 34003)
-sql import into tb values(1516716800000, 50001)
-sql import into tb values(1517580800000, 50001)
+sql import into tb values(1515852800001, -48)
+sql import into tb values(1516716800000, -38)
+sql import into tb values(1517580800000, -28)
 
 sql select * from tb;
-if $rows != 50 then 
+if $rows != 52 then 
   return -1
 endi
 
 print ================= step15
-system sh/exec_up.sh -n dnode2 -s start
-sleep 8000
-system sh/exec_up.sh -n dnode1 -s stop
-sleep 10000
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec_up.sh -n dnode1 -s start
+sleep 5000
 
-if $rows != 50 then 
+if $rows != 52 then 
   return -1
 endi
 
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index 8d70d227a5033b837bb0faf3940b18f81ed0be38..ad236bfb0cae4a821b757d93d0f04285439f0f7b 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -20,14 +20,14 @@ 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_up.sh -n dnode1 -s start
-sleep 5000
+sleep 3000
 sql connect
 
 sql create dnode $hostname2
@@ -38,10 +38,10 @@ system sh/exec_up.sh -n dnode3 -s start
 
 sql create database ir3db replica 3 days 7
 sql use ir3db
-sql create table tb(ts timestamp, i int)
+sql create table tb(ts timestamp, i bigint)
 
 print ================= step1
-sql import into tb values(1520000010000, 10000)
+sql import into tb values(1520000010000, 1520000010000)
 sql select * from tb;
 print $rows
 if $rows != 1 then 
@@ -49,7 +49,7 @@ if $rows != 1 then
 endi
 
 print ================= step2
-sql insert into tb values(1520000008000, 8000)
+sql insert into tb values(1520000008000, 1520000008000)
 print $rows
 sql select * from tb;
 if $rows != 2 then 
@@ -57,7 +57,7 @@ if $rows != 2 then
 endi
 
 print ================= step3
-sql insert into tb values(1520000020000, 20000)
+sql insert into tb values(1520000020000, 1520000020000)
 sql select * from tb;
 print $rows
 if $rows != 3 then 
@@ -65,9 +65,9 @@ if $rows != 3 then
 endi
 
 print ================= step4
-sql import into tb values(1520000009000, 9000)
-sql import into tb values(1520000015000, 15000)
-sql import into tb values(1520000030000, 30000)
+sql import into tb values(1520000009000, 1520000009000)
+sql import into tb values(1520000015000, 1520000015000)
+sql import into tb values(1520000030000, 1520000030000)
 sql select * from tb;
 print $rows
 if $rows != 6 then 
@@ -75,10 +75,10 @@ if $rows != 6 then
 endi
 
 print ================= step5
-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 insert into tb values(1520000008000, 1520000008000)
+sql insert into tb values(1520000014000, 1520000014000)
+sql insert into tb values(1520000025000, 1520000025000)
+sql insert into tb values(1520000040000, 1520000040000)
 sql select * from tb;
 print $rows
 if $rows != 9 then 
@@ -86,47 +86,48 @@ if $rows != 9 then
 endi
 
 print ================= step6
-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 import into tb values(1520000007000, 1520000007000)
+sql import into tb values(1520000012000, 1520000012000)
+sql import into tb values(1520000023000, 1520000023000)
+sql import into tb values(1520000034000, 1520000034000)
+sql import into tb values(1520000050000, 1520000050000)
 sql select * from tb;
 print $rows
 if $rows != 14 then 
   return -1
 endi
 
-#print ================== dnode restart
-#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
-#sleep 5000
-#system sh/exec_up.sh -n dnode1 -s start
-#sleep 5000
-#sql select * from tb;
-#if $rows != 14 then 
-#  return -1
-#endi
+print ================== dnode restart
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec_up.sh -n dnode1 -s start
+sleep 5000
+sql select * from tb;
+if $rows != 14 then 
+  return -1
+endi
 
 print ================= step7
-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 import into tb values(1520000007001, 1520000007001)
+sql import into tb values(1520000012001, 1520000012001)
+sql import into tb values(1520000023001, 1520000023001)
+sql import into tb values(1520000034001, 1520000034001)
+sql import into tb values(1520000050001, 1520000050001)
 sql select * from tb;
 print $rows
-if $rows != 19 then 
+if $rows != 19 then
+  print expect 19, actual: $rows
   return -1
 endi
 
 print ================= step8
-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 insert into tb values(1520000008002, 1520000008002)
+sql insert into tb values(1520000014002, 1520000014002)
+sql insert into tb values(1520000025002, 1520000025002)
+sql insert into tb values(1520000060000, 1520000060000)
 sql select * from tb;
 print $rows
-if $rows != 24 then 
+if $rows != 23 then 
   return -1
 endi
 
@@ -145,21 +146,21 @@ print ================= step9
 #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 import into tb values(1517408000000, 1517408000000)
+sql import into tb values(1518272000000, 1518272000000)
+sql import into tb values(1519136000000, 1519136000000)
+sql import into tb values(1519568000000, 1519568000000)
+sql import into tb values(1519654400000, 1519654400000)
+sql import into tb values(1519827200000, 1519827200000)
+sql import into tb values(1520345600000, 1520345600000)
+sql import into tb values(1520691200000, 1520691200000)
+sql import into tb values(1520864000000, 1520864000000)
+sql import into tb values(1521900800000, 1521900800000)
+sql import into tb values(1523110400000, 1523110400000)
+sql import into tb values(1521382400000, 1521382400000)
 sql select * from tb;
 print $rows
-if $rows != 36 then 
+if $rows != 35 then 
   return -1
 endi
 
@@ -170,55 +171,57 @@ system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
 print $rows
-if $rows != 36 then 
+if $rows != 35 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(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
+sql import into tb values(1515680000000, 1) (1515852800000, 2) (1516025600000, 3) (1516198400000, 4) (1516371200000, 5)
 sql select * from tb;
-if $rows != 41 then 
+if $rows != 40 then 
   return -1
 endi
 
 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 import into tb values(now-19d, -19) (now-18d, -18) (now-17d, -17) (now-16d, -16) (now-15d, -15) (now-14d, -14) (now-13d, -13) (now-12d, -12) (now-11d, -11)
+sql import into tb values(1518358400000, 6) (1518444800000, 7) (1518531200000, 8) (1518617600000, 9) (1518704000000, 10) (1518790400000, 11) (1518876800000, 12) (1518963200000, 13) (1519049600000, 14)
 sql select * from tb;
 print $rows
-if $rows != 50 then 
+if $rows != 49 then 
   return -1
 endi
 
 print ================= step13
-system sh/exec_up.sh -n dnode2 -s stop 
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000
 
 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(now-48d, -48)
+#sql import into tb values(now-38d, -38)
+#sql import into tb values(now-28d, -28)
 
-sql import into tb values(1515852800001, 34003)
-sql import into tb values(1516716800000, 50001)
-sql import into tb values(1517580800000, 50001)
+sql import into tb values(1515852800001, -48)
+sql import into tb values(1516716800000, -38)
+sql import into tb values(1517580800000, -28)
 
 sql select * from tb;
-if $rows != 50 then 
+if $rows != 52 then 
   return -1
 endi
 
 print ================= step15
-system sh/exec_up.sh -n dnode2 -s start
-sleep 8000
-system sh/exec_up.sh -n dnode3 -s stop
-sleep 3000
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+system sh/exec_up.sh -n dnode3 -s start
+sleep 5000
 
-if $rows != 50 then 
+if $rows != 52 then 
   return -1
 endi
 
diff --git a/tests/script/unique/stable/balance_replica1.sim b/tests/script/unique/stable/balance_replica1.sim
index 8cf41319a020d201af62d4a775737aac679f9bba..9257ba79beeea5060ed8b4b7dc38e0ad7721c59b 100644
--- a/tests/script/unique/stable/balance_replica1.sim
+++ b/tests/script/unique/stable/balance_replica1.sim
@@ -7,8 +7,8 @@ system sh/cfg.sh -n dnode1 -c statusInterval -v 1
 system sh/cfg.sh -n dnode2 -c statusInterval -v 1
 system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
-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 dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
@@ -60,20 +60,20 @@ print =============== step2
 $x = 0
 show1: 
 	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
+	sleep 2000
+	if $x == 10 then 
 	  return -1
 	endi
 sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
 
-if $dnode1Vnodes != 0 then
+if $dnode1Vnodes != 4 then
   goto show1
 endi
-if $dnode2Vnodes != NULL then
+if $dnode2Vnodes != null then
   goto show1
 endi
 print =============== step3 start dnode2
@@ -89,9 +89,9 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/unique/stable/dnode2_stop.sim
index 55ad5fcf094bb35cd399762bbce23e3b0b390d4b..0cf13fa286b7ff332f609ed88fe3504347046642 100644
--- a/tests/script/unique/stable/dnode2_stop.sim
+++ b/tests/script/unique/stable/dnode2_stop.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-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 dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
diff --git a/tests/script/unique/stable/dnode3.sim b/tests/script/unique/stable/dnode3.sim
index c9dd31f6f80421791f4b2fecf34d58e2205383d8..8025b180d898014d16b2450a0acc4ff63eaf8162 100644
--- a/tests/script/unique/stable/dnode3.sim
+++ b/tests/script/unique/stable/dnode3.sim
@@ -84,13 +84,13 @@ print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
 
-if $dnode1Vnodes != 3 then
+if $dnode1Vnodes != 1 then
   return -1
 endi
-if $dnode2Vnodes != 3 then
+if $dnode2Vnodes != 1 then
   return -1
 endi
-if $dnode3Vnodes != 3 then
+if $dnode3Vnodes != 1 then
   return -1
 endi
 
diff --git a/tests/script/unique/stable/replica2_dnode4.sim b/tests/script/unique/stable/replica2_dnode4.sim
index f204e059491b63e79008a9d54b2e1934b9f28072..b96535fccd4f89a1472964d5d22823c953102f46 100644
--- a/tests/script/unique/stable/replica2_dnode4.sim
+++ b/tests/script/unique/stable/replica2_dnode4.sim
@@ -3,10 +3,10 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-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
+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
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/stable/replica2_vnode3.sim b/tests/script/unique/stable/replica2_vnode3.sim
index 238e2e4aee36c3311cb57a6c16e270db1a9e8195..c7882d7a960077c20b935b8a3e5c2dafb2610a7e 100644
--- a/tests/script/unique/stable/replica2_vnode3.sim
+++ b/tests/script/unique/stable/replica2_vnode3.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-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 dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
diff --git a/tests/script/unique/stable/replica3_dnode6.sim b/tests/script/unique/stable/replica3_dnode6.sim
index 1c8a8ae10ecb817fef4a1f72518caa30c4da197d..0dc81999ca63b3c9551980fa84f451ee8d86c8ca 100644
--- a/tests/script/unique/stable/replica3_dnode6.sim
+++ b/tests/script/unique/stable/replica3_dnode6.sim
@@ -6,12 +6,12 @@ system sh/deploy.sh -n dnode4 -i 4
 system sh/deploy.sh -n dnode5 -i 5
 system sh/deploy.sh -n dnode6 -i 6
 
-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
-system sh/cfg.sh -n dnode5 -c walLevel -v 0
-system sh/cfg.sh -n dnode6 -c walLevel -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
+system sh/cfg.sh -n dnode5 -c walLevel -v 2
+system sh/cfg.sh -n dnode6 -c walLevel -v 2
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/stable/replica3_vnode3.sim b/tests/script/unique/stable/replica3_vnode3.sim
index 75870af4c43de82dc99ba375a0035040bf249d9e..fe310aa0f7e5136db9517866b23c5a666674ce08 100644
--- a/tests/script/unique/stable/replica3_vnode3.sim
+++ b/tests/script/unique/stable/replica3_vnode3.sim
@@ -4,10 +4,10 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-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
+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
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4