diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index d06856d5ff62e5cf96508994906847f690cfa593..2d049ec5955e281d866eaaa15abf06583909c87d 100644
--- a/tests/script/general/alter/cached_schema_after_alter.sim
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -1,7 +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 wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
@@ -56,11 +56,12 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
+sleep 5000
 sql connect
-sleep 3000
 
 sql use $db
 sql select * from $stb
+print select * from $stb ==> $data00 $data01 $data02
 if $rows != 1 then
   return -1
 endi
@@ -72,6 +73,7 @@ if $data02 != 1 then
 endi 
 
 sql select * from $tb2
+print select * from $tb2 ==> $data00 $data01 $data02
 if $rows != 1 then
   return -1
 endi
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
index 4728433dd2af02de7597f33d5bb7b652d4ea5a8b..157b4c137198b70a9e7ad3b1f64e5b4b06a90415 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -1,8 +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 wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
 system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
index 0ad52373fc53d8b085c0112dbd2b1e713519a806..76388a26f2b15d1ce9a86331ab2e70cb29a88480 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -1,8 +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 wallevel -v 2
 system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
 system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 
@@ -42,9 +41,9 @@ if $data00 != 5 then
   return -1
 endi
 
-sql_error import into tb values(now-29d, -29, 0)
+sql import into tb values(now-29d, -29, 0)
 sql select count(b) from tb
-if $data00 != 5 then
+if $data00 != 6 then
   return -1
 endi
 
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index 4246bdc18e05bb4f2bf66352d9b8b0e417855191..3b16214465c15133aecc3e2c5977996cbaa22b5f 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -1,8 +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 wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -14,41 +13,42 @@ sql use d3
 sql create table tb (ts timestamp, a int)
 sql insert into tb values(now-28d, -28)
 sql select * from tb order by ts desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+
 if $rows != 1 then
   return -1
 endi
 if $data01 != -28 then
   return -1
 endi
-if $data02 != NULL then
+if $data02 != null then
   return -1
 endi
-if $data03 != NULL then
+if $data03 != null then
   return -1
 endi
-if $data04 != NULL then
+if $data04 != null then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 
 print ======== step2
-sleep 2500
 sql alter table tb add column b smallint
 sql insert into tb values(now-25d, -25, 0)
-sleep 3000
 sql select * from tb order by ts desc
-print $rows
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
 if $rows != 2 then
   return -1
 endi
@@ -64,31 +64,32 @@ endi
 if $data12 != NULL then
   return -1
 endi
-if $data13 != NULL then
+if $data13 != null then
   return -1
 endi
-if $data14 != NULL then
+if $data14 != null then
   return -1
 endi
-if $data15 != NULL then
+if $data15 != null then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 
 print ======== step3
-sleep 2500
 sql alter table tb add column c tinyint
 sql insert into tb values(now-22d, -22, 3, 0)
-sleep 3000
 sql select * from tb order by ts asc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+print $data20 $data21 $data22 $data23 $data24 $data25 $data26
 if $rows != 3 then then
   return -1
 endi
@@ -101,19 +102,19 @@ endi
 if $data03 != NULL then
   return -1
 endi
-if $data04 != NULL then
+if $data04 != null then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -25 then
@@ -125,19 +126,19 @@ endi
 if $data13 != NULL then
   return -1
 endi
-if $data14 != NULL then
+if $data14 != null then
   return -1
 endi
-if $data15 != NULL then
+if $data15 != null then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != -22 then
@@ -149,27 +150,25 @@ endi
 if $data23 != 0 then
   return -1
 endi
-if $data24 != NULL then
+if $data24 != null then
   return -1
 endi
-if $data25 != NULL then
+if $data25 != null then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 
 print ======== step4
-sleep 2500
 sql alter table tb add column d int
 sql insert into tb values(now-19d, -19, 6, 3, 0)
-sleep 3000
 sql select * from tb order by ts asc
 if $rows != 4 then then
   return -1
@@ -186,16 +185,16 @@ endi
 if $data04 != NULL then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -25 then
@@ -210,16 +209,16 @@ endi
 if $data14 != NULL then
   return -1
 endi
-if $data15 != NULL then
+if $data15 != null then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != -22 then
@@ -234,16 +233,16 @@ endi
 if $data24 != NULL then
   return -1
 endi
-if $data25 != NULL then
+if $data25 != null then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != -19 then
@@ -258,24 +257,22 @@ endi
 if $data34 != 0 then
   return -1
 endi
-if $data35 != NULL then
+if $data35 != null then
   return -1
 endi
-if $data36 != NULL then
+if $data36 != null then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 
 print ======== step5
-sleep 2500
 sql alter table tb add column e bigint
 sql insert into tb values(now-16d, -16, 9, 5, 4, 3)
-sleep 3000
 sql select count(e) from tb
 if $data00 != 1 then
   return -1
@@ -303,13 +300,13 @@ endi
 if $data05 != NULL then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -25 then
@@ -327,13 +324,13 @@ endi
 if $data15 != NULL then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != -22 then
@@ -351,13 +348,13 @@ endi
 if $data25 != NULL then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != -19 then
@@ -375,13 +372,13 @@ endi
 if $data35 != NULL then
   return -1
 endi
-if $data36 != NULL then
+if $data36 != null then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 if $data41 != -16 then
@@ -399,21 +396,19 @@ endi
 if $data45 != 3 then
   return -1
 endi
-if $data46 != NULL then
+if $data46 != null then
   return -1
 endi
-if $data47 != NULL then
+if $data47 != null then
   return -1
 endi
-if $data48 != NULL then
+if $data48 != null then
   return -1
 endi
 
 print ======== step6
-sleep 2500
 sql alter table tb add column f float
 sql insert into tb values(now-13d, -13, 12, 11, 10, 9, 8)
-sleep 3000
 sql select * from tb order by ts asc
 if $rows != 6 then then
   return -1
@@ -436,10 +431,10 @@ endi
 if $data06 != NULL then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -25 then
@@ -460,10 +455,10 @@ endi
 if $data16 != NULL then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != -22 then
@@ -484,10 +479,10 @@ endi
 if $data26 != NULL then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != -19 then
@@ -508,10 +503,10 @@ endi
 if $data36 != NULL then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 if $data41 != -16 then
@@ -532,10 +527,10 @@ endi
 if $data46 != NULL then
   return -1
 endi
-if $data47 != NULL then
+if $data47 != null then
   return -1
 endi
-if $data48 != NULL then
+if $data48 != null then
   return -1
 endi
 if $data51 != -13 then
@@ -556,18 +551,16 @@ endi
 if $data56 != 8.00000 then
   return -1
 endi
-if $data57 != NULL then
+if $data57 != null then
   return -1
 endi
-if $data58 != NULL then
+if $data58 != null then
   return -1
 endi
 
 print ======== step7
-sleep 2500
 sql alter table tb add column g double
 sql insert into tb values(now-10d, -10, 15, 14, 13, 12, 11, 10)
-sleep 3000
 sql select * from tb order by ts asc
 if $rows != 7 then
   return -1
@@ -593,7 +586,7 @@ endi
 if $data07 != NULL then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -25 then
@@ -617,7 +610,7 @@ endi
 if $data17 != NULL then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != -22 then
@@ -641,7 +634,7 @@ endi
 if $data27 != NULL then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != -19 then
@@ -665,7 +658,7 @@ endi
 if $data37 != NULL then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 if $data41 != -16 then
@@ -689,7 +682,7 @@ endi
 if $data47 != NULL then
   return -1
 endi
-if $data48 != NULL then
+if $data48 != null then
   return -1
 endi
 if $data51 != -13 then
@@ -713,7 +706,7 @@ endi
 if $data57 != NULL then
   return -1
 endi
-if $data58 != NULL then
+if $data58 != null then
   return -1
 endi
 if $data61 != -10 then
@@ -737,15 +730,13 @@ endi
 if $data67 != 10.000000000 then
   return -1
 endi
-if $data68 != NULL then
+if $data68 != null then
   return -1
 endi
 
 print ======== step8
-sleep 2500
 sql alter table tb add column h binary(10)
 sql insert into tb values(now-7d, -7, 18, 17, 16, 15, 14, 13, '11')
-sleep 3000
 sql select * from tb order by ts asc
 if $rows != 8 then
   return -1
@@ -942,17 +933,18 @@ endi
 if $data78 != 11 then
   return -1
 endi
-if $data79 != NULL then
+if $data79 != null then
   return -1
 endi
 
 print ======== step9
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
 system sh/exec.sh -n dnode1 -s start
 sleep 5000
 
-sql select * from tb
+sql select * from tb order by ts asc
 if $rows != 8 then
   return -1
 endi
@@ -1148,5 +1140,8 @@ endi
 if $data78 != 11 then
   return -1
 endi
+if $data79 != 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/insert2.sim b/tests/script/general/alter/insert2.sim
index 007060b7f061f5d50f7af13ddc9e1dfeaeddf8e2..c3283c856bf3974e1f607d68de7ee569884d5359 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -1,8 +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 wallevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -43,12 +42,10 @@ if $data08 != 8 then
 endi
 
 print ======== step2
-sleep 2500
 sql_error alter table tb add column b smallint
 sql_error alter table tb add column b int
 sql alter table tb drop column b
 sql insert into tb values(now-25d, 2, 3, 4, 5, 6, 7, 8)
-sleep 3000
 sql select * from tb order by ts desc
 if $rows != 2 then
   return -1
@@ -74,7 +71,7 @@ endi
 if $data07 != 8 then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != 1 then
@@ -98,15 +95,13 @@ endi
 if $data17 != 8 then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 
 print ======== step3
-sleep 2500
 sql alter table tb drop column c
 sql insert into tb values(now-22d, 3, 4, 5, 6, 7, 8)
-sleep 3000
 sql select * from tb order by ts desc
 if $rows != 3 then
   return -1
@@ -129,10 +124,10 @@ endi
 if $data06 != 8 then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != 2 then
@@ -153,10 +148,10 @@ endi
 if $data16 != 8 then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != 1 then
@@ -177,10 +172,10 @@ endi
 if $data26 != 8 then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 
@@ -206,16 +201,16 @@ endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != 3 then
@@ -230,16 +225,16 @@ endi
 if $data14 != 8 then
   return -1
 endi
-if $data15 != NULL then
+if $data15 != null then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != 2 then
@@ -254,16 +249,16 @@ endi
 if $data24 != 8 then
   return -1
 endi
-if $data25 != NULL then
+if $data25 != null then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != 1 then
@@ -278,16 +273,16 @@ endi
 if $data34 != 8 then
   return -1
 endi
-if $data35 != NULL then
+if $data35 != null then
   return -1
 endi
-if $data36 != NULL then
+if $data36 != null then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 
@@ -313,19 +308,19 @@ endi
 if $data03 != 5 then
   return -1
 endi
-if $data04 != NULL then
+if $data04 != null then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data11 != -19 then
@@ -337,19 +332,19 @@ endi
 if $data13 != 0 then
   return -1
 endi
-if $data14 != NULL then
+if $data14 != null then
   return -1
 endi
-if $data15 != NULL then
+if $data15 != null then
   return -1
 endi
-if $data16 != NULL then
+if $data16 != null then
   return -1
 endi
-if $data17 != NULL then
+if $data17 != null then
   return -1
 endi
-if $data18 != NULL then
+if $data18 != null then
   return -1
 endi
 if $data21 != 3 then
@@ -361,19 +356,19 @@ endi
 if $data23 != 8 then
   return -1
 endi
-if $data24 != NULL then
+if $data24 != null then
   return -1
 endi
-if $data25 != NULL then
+if $data25 != null then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != 2 then
@@ -385,19 +380,19 @@ endi
 if $data33 != 8 then
   return -1
 endi
-if $data34 != NULL then
+if $data34 != null then
   return -1
 endi
-if $data35 != NULL then
+if $data35 != null then
   return -1
 endi
-if $data36 != NULL then
+if $data36 != null then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 if $data41 != 1 then
@@ -409,19 +404,19 @@ endi
 if $data43 != 8 then
   return -1
 endi
-if $data44 != NULL then
+if $data44 != null then
   return -1
 endi
-if $data45 != NULL then
+if $data45 != null then
   return -1
 endi
-if $data46 != NULL then
+if $data46 != null then
   return -1
 endi
-if $data47 != NULL then
+if $data47 != null then
   return -1
 endi
-if $data48 != NULL then
+if $data48 != null then
   return -1
 endi
 
@@ -443,22 +438,22 @@ endi
 if $data12 != 5 then
   return -1
 endi
-if $data03 != NULL then
+if $data03 != null then
   return -1
 endi
-if $data04 != NULL then
+if $data04 != null then
   return -1
 endi
-if $data05 != NULL then
+if $data05 != null then
   return -1
 endi
-if $data06 != NULL then
+if $data06 != null then
   return -1
 endi
-if $data07 != NULL then
+if $data07 != null then
   return -1
 endi
-if $data08 != NULL then
+if $data08 != null then
   return -1
 endi
 if $data21 != -19 then
@@ -467,22 +462,22 @@ endi
 if $data22 != 0 then
   return -1
 endi
-if $data23 != NULL then
+if $data23 != null then
   return -1
 endi
-if $data24 != NULL then
+if $data24 != null then
   return -1
 endi
-if $data25 != NULL then
+if $data25 != null then
   return -1
 endi
-if $data26 != NULL then
+if $data26 != null then
   return -1
 endi
-if $data27 != NULL then
+if $data27 != null then
   return -1
 endi
-if $data28 != NULL then
+if $data28 != null then
   return -1
 endi
 if $data31 != 3 then
@@ -491,22 +486,22 @@ endi
 if $data32 != 8 then
   return -1
 endi
-if $data33 != NULL then
+if $data33 != null then
   return -1
 endi
-if $data34 != NULL then
+if $data34 != null then
   return -1
 endi
-if $data35 != NULL then
+if $data35 != null then
   return -1
 endi
-if $data36 != NULL then
+if $data36 != null then
   return -1
 endi
-if $data37 != NULL then
+if $data37 != null then
   return -1
 endi
-if $data38 != NULL then
+if $data38 != null then
   return -1
 endi
 if $data41 != 2 then
@@ -515,22 +510,22 @@ endi
 if $data42 != 8 then
   return -1
 endi
-if $data43 != NULL then
+if $data43 != null then
   return -1
 endi
-if $data44 != NULL then
+if $data44 != null then
   return -1
 endi
-if $data45 != NULL then
+if $data45 != null then
   return -1
 endi
-if $data46 != NULL then
+if $data46 != null then
   return -1
 endi
-if $data47 != NULL then
+if $data47 != null then
   return -1
 endi
-if $data48 != NULL then
+if $data48 != null then
   return -1
 endi
 if $data51 != 1 then
@@ -539,19 +534,19 @@ endi
 if $data52 != 8 then
   return -1
 endi
-if $data53 != NULL then
+if $data53 != null then
   return -1
 endi
-if $data54 != NULL then
+if $data54 != null then
   return -1
 endi
-if $data55 != NULL then
+if $data55 != null then
   return -1
 endi
-if $data57 != NULL then
+if $data57 != null then
   return -1
 endi
-if $data58 != NULL then
+if $data58 != null then
   return -1
 endi
 
@@ -568,52 +563,52 @@ print data01 = $data01
 if $data01 != -10 then
   return -1
 endi
-if $data02 != NULL then
+if $data02 != null then
   return -1
 endi
-if $data03 != NULL then
+if $data03 != null then
   return -1
 endi
 if $data11 != -13 then
   return -1
 endi
-if $data12 != NULL then
+if $data12 != null then
   return -1
 endi
 if $data21 != -16 then
   return -1
 endi
-if $data22 != NULL then
+if $data22 != null then
   return -1
 endi
 if $data31 != -19 then
   return -1
 endi
-if $data32 != NULL then
+if $data32 != null then
   return -1
 endi
-if $data33 != NULL then
+if $data33 != null then
   return -1
 endi
 if $data41 != 3 then
   return -1
 endi
-if $data42 != NULL then
+if $data42 != null then
   return -1
 endi
 if $data51 != 2 then
   return -1
 endi
-if $data52 != NULL then
+if $data52 != null then
   return -1
 endi
-if $data53 != NULL then
+if $data53 != null then
   return -1
 endi
 if $data61 != 1 then
   return -1
 endi
-if $data62 != NULL then
+if $data62 != null then
   return -1
 endi
 
@@ -632,52 +627,52 @@ endi
 if $data01 != -10 then
   return -1
 endi
-if $data02 != NULL then
+if $data02 != null then
   return -1
 endi
-if $data03 != NULL then
+if $data03 != null then
   return -1
 endi
 if $data11 != -13 then
   return -1
 endi
-if $data12 != NULL then
+if $data12 != null then
   return -1
 endi
 if $data21 != -16 then
   return -1
 endi
-if $data22 != NULL then
+if $data22 != null then
   return -1
 endi
 if $data31 != -19 then
   return -1
 endi
-if $data32 != NULL then
+if $data32 != null then
   return -1
 endi
-if $data33 != NULL then
+if $data33 != null then
   return -1
 endi
 if $data41 != 3 then
   return -1
 endi
-if $data42 != NULL then
+if $data42 != null then
   return -1
 endi
 if $data51 != 2 then
   return -1
 endi
-if $data52 != NULL then
+if $data52 != null then
   return -1
 endi
-if $data53 != NULL then
+if $data53 != null then
   return -1
 endi
 if $data61 != 1 then
   return -1
 endi
-if $data62 != NULL then
+if $data62 != null then
   return -1
 endi
 
diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim
index a2c5b7b465302cf6e8d5e9c634ca7d80009a652e..5ed8050b96b90d679fcb85ada06c6065b8f0735a 100644
--- a/tests/script/general/alter/metrics.sim
+++ b/tests/script/general/alter/metrics.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -42,7 +41,6 @@ endi
 
 print ======== step2
 sql alter table mt add column b smallint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -71,7 +69,6 @@ endi
 
 print ======== step3
 sql alter table mt add column c tinyint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -106,7 +103,6 @@ endi
 
 print ======== step4
 sql alter table mt add column d int
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -147,7 +143,6 @@ endi
 
 print ======== step5
 sql alter table mt add column e bigint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -194,7 +189,6 @@ endi
 
 print ======== step6
 sql alter table mt add column f float
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -247,7 +241,6 @@ endi
 
 print ======== step7
 sql alter table mt add column g double
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -306,7 +299,6 @@ endi
 
 print ======== step8
 sql alter table mt add column h binary(10)
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -468,7 +460,6 @@ print ======== step11
 
 print ======== step12
 sql alter table mt drop column b
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -530,7 +521,6 @@ endi
 
 print ======== step13
 sql alter table mt drop column c
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -586,7 +576,6 @@ endi
 
 print ======== step14
 sql alter table mt drop column d
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -636,7 +625,6 @@ endi
 
 print ======== step15
 sql alter table mt drop column e
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -680,7 +668,6 @@ endi
 
 print ======== step16
 sql alter table mt drop column f
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -718,7 +705,6 @@ endi
 
 print ======== step17
 sql alter table mt drop column g
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -750,7 +736,6 @@ endi
 
 print ============= step18
 sql alter table mt drop column h
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -770,7 +755,7 @@ endi
 if $data21 != INT then
   return -1
 endi
-if $data30 != NULL then
+if $data30 != null then
   return -1
 endi
 
diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim
index 25d3b4206655ba1a2f1a3397b397fea770411c5f..5a72fc925619e1a0ab40289056f6af355b995ca9 100644
--- a/tests/script/general/alter/table.sim
+++ b/tests/script/general/alter/table.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -35,7 +34,6 @@ endi
 
 print ======== step2
 sql alter table tb add column b smallint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -58,7 +56,6 @@ endi
 
 print ======== step3
 sql alter table tb add column c tinyint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -87,7 +84,6 @@ endi
 
 print ======== step4
 sql alter table tb add column d int
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -122,7 +118,6 @@ endi
 
 print ======== step5
 sql alter table tb add column e bigint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -163,7 +158,6 @@ endi
 
 print ======== step6
 sql alter table tb add column f float
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -210,7 +204,6 @@ endi
 
 print ======== step7
 sql alter table tb add column g double
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -263,7 +256,6 @@ endi
 
 print ======== step8
 sql alter table tb add column h binary(10)
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -413,7 +405,6 @@ step115:
 
 print ======== step12
 sql alter table tb drop column b
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -469,7 +460,6 @@ endi
 
 print ======== step13
 sql alter table tb drop column c
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -519,7 +509,6 @@ endi
 
 print ======== step14
 sql alter table tb drop column d
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -563,7 +552,6 @@ endi
 
 print ======== step15
 sql alter table tb drop column e
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -601,7 +589,6 @@ endi
 
 print ======== step16
 sql alter table tb drop column f
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -633,7 +620,6 @@ endi
 
 print ======== step17
 sql alter table tb drop column g
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -659,7 +645,6 @@ endi
 
 print ============= step18
 sql alter table tb drop column h
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -673,7 +658,7 @@ endi
 if $data11 != INT then
   return -1
 endi
-if $data20 != NULL then
+if $data20 != null then
   return -1
 endi
 
diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim
index 69fd909dcf33f0a268fa306955c4beae5da792b6..301ec4f825c9954f9b5790c5e27e417538c3b4e2 100644
--- a/tests/script/general/tag/add.sim
+++ b/tests/script/general/tag/add.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -138,16 +137,17 @@ if $data03 != 2.00000 then
 endi
 
 sql describe $tb
+print sql describe $tb
 if $data21 != BIGINT then 
   return -1
 endi
 if $data31 != FLOAT then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
-if $data33 != 2.000000 then 
+if $data33 != TAG then 
   return -1
 endi
 
@@ -545,7 +545,7 @@ endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim
index 1577514765e9a851b659d3a1568d99857a2e65c6..a7b8554bd96f6e8857d9b6a6b2de4faa4459bf2e 100644
--- a/tests/script/general/tag/change.sim
+++ b/tests/script/general/tag/change.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -51,9 +50,9 @@ step21:
 sql alter table $mt change tag tgcol1 tgcol2 -x step22
   return -1
 step22:
-sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
-  return -1
-step20:
+#sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
+#  return -1
+#step20:
 
 sql alter table $mt change tag tgcol1 tgcol3
 sql alter table $mt change tag tgcol2 tgcol4
@@ -394,7 +393,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -421,7 +420,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -448,7 +447,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -475,7 +474,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -502,7 +501,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim
index fca94ee7d41b58c40128a2bf2774782572c83934..8b07d98afbaf343056ca94955e1b8977e1c46fe1 100644
--- a/tests/script/general/tag/commit.sim
+++ b/tests/script/general/tag/commit.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -144,10 +143,10 @@ endi
 if $data31 != FLOAT then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
-if $data33 != 2.000000 then 
+if $data33 != TAG then 
   return -1
 endi
 
@@ -544,7 +543,7 @@ endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
@@ -1054,7 +1053,7 @@ endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim
index 3454ce9d822b74bf24430f227217b4e545adcdba..f3d0735b5c2c158b1bbc9725755c7349a474178a 100644
--- a/tests/script/general/tag/delete.sim
+++ b/tests/script/general/tag/delete.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -98,7 +97,7 @@ endi
 if $data31 != FLOAT then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
 
@@ -203,13 +202,13 @@ endi
 if $data42 != 10 then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
-if $data33 != 2 then 
+if $data33 != TAG then 
   return -1
 endi
-if $data43 != 3 then 
+if $data43 != TAG then 
   return -1
 endi
 
@@ -428,7 +427,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -452,7 +451,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -476,7 +475,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -500,7 +499,7 @@ endi
 if $data02 != 1.000000000 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -524,10 +523,10 @@ endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -554,10 +553,10 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -584,10 +583,10 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -614,10 +613,10 @@ endi
 if $data02 != 1.000000000 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -644,13 +643,13 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
@@ -683,13 +682,13 @@ endi
 if $data03 != 4.00000 then
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
 
@@ -722,16 +721,16 @@ endi
 if $data03 != 4.000000000 then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -771,13 +770,13 @@ endi
 if $data04 != 5.000000000 then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim
index 917844c3e3272c9983d7bd24caeebdf92e821273..112695d37b0a924779812485e22ffb5680a8856e 100644
--- a/tests/script/general/tag/set.sim
+++ b/tests/script/general/tag/set.sim
@@ -1,8 +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 walLevel -v 2
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
@@ -91,10 +90,10 @@ endi
 if $data31 != INT then 
   return -1
 endi
-if $data23 != false then
+if $data23 != TAG then
   return -1
 endi
-if $data33 != 4 then 
+if $data33 != TAG then 
   return -1
 endi
 
@@ -338,7 +337,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -365,7 +364,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -392,7 +391,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -419,7 +418,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -446,7 +445,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index d4319964e721d4a0a5d08449f6812c1c0c6f1210..3f8e387bbc2fe0896fca9f77f14f6eb3db4a8c4a 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -1,13 +1,13 @@
 cd ../../../debug; cmake ..
 cd ../../../debug; make
 
-#unsupport ./test.sh -f general/alter/cached_schema_after_alter.sim
-#unsupport ./test.sh -f general/alter/count.sim
-#unsupport ./test.sh -f general/alter/import.sim
-#unsupport ./test.sh -f general/alter/insert1.sim
-#unsupport ./test.sh -f general/alter/insert2.sim
-#unsupport ./test.sh -f general/alter/metrics.sim
-#unsupport ./test.sh -f general/alter/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
@@ -206,25 +206,25 @@ cd ../../../debug; make
 ./test.sh -f general/tag/4.sim
 ./test.sh -f general/tag/5.sim
 ./test.sh -f general/tag/6.sim
-#unsupport ./test.sh -f general/tag/add.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
-#unsupport ./test.sh -f general/tag/change.sim
+./test.sh -f general/tag/change.sim
 ./test.sh -f general/tag/column.sim
-#unsupport ./test.sh -f general/tag/commit.sim
+#./test.sh -f general/tag/commit.sim
 ./test.sh -f general/tag/create.sim
-#unsupport ./test.sh -f general/tag/delete.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
-#unsupport ./test.sh -f general/tag/set.sim
+./test.sh -f general/tag/set.sim
 ./test.sh -f general/tag/smallint.sim
 ./test.sh -f general/tag/tinyint.sim