diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim
index 2217c39430f4fe35ba9412c98ab99ee19aa3c90e..814438ac74531c565327bca6bb9615928bf289e1 100644
--- a/tests/script/general/agg/stream.sim
+++ b/tests/script/general/agg/stream.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 
 print ========== step1
 system sh/cfg.sh -n dnode1 -c monitor -v 1
diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index 52507b1992175cf538170db63c76174cebee2667..d81720a1da41f52ce2aacf86b4cdd1a1722a6070 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 clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
index 1b77f997ac7e225689b31ed973c1f8df462baaac..a6a2a13ef7345621833536917fbe46096f3829b1 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
index 7348cc919ee342b2897ab8bdf82b1890d9c7225b..1771d472984ea135eac7a9221f07cca6aaff0ded 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index 0daa9c6432c8db7e11102d47ee8ce8144ff39041..7095313a0d24213f61b77907a6552780e0072e1e 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
index 34f935a04b6cc3d2099cb88f84417513e59dd16a..a248c7cd2b3a0247468a23202c6cff9205ba2e3f 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim
index 6972e341970b49afe211006c2b349a5a41d631cd..cb94904ff27903acb57b2202c790d25a9b1877ba 100644
--- a/tests/script/general/column/stream.sim
+++ b/tests/script/general/column/stream.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 
 print ========== step1
 system sh/cfg.sh -n dnode1 -c monitor         -v 1
diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim
index 9d56e1c5fb99acc39d2e953d1d3600bfcb6d5d4e..dddc976ab3a4090b01b6e0915c52acf2177e90fe 100644
--- a/tests/script/general/db/basic.sim
+++ b/tests/script/general/db/basic.sim
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 1000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
index 2204e7434f65ae08bdcbd0314fde1ee305da85c1..b12a60b4a6416020ff30d657fba92a94ff637af8 100644
--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -65,7 +65,7 @@ $tbPrefix = t
 $i = 0
 while $i < 1000
   $db = db . $i
-  sql create database $db tables 4
+  sql create database $db maxTables 4
   sql use $db
 
   sql create table st (ts timesetamp, i int) tags(j int);
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index dcf74a287da9ea693dd9c78131aaee85dec17f0f..949c4d4b27e2d97108a9bc56ec099bff8152f8b8 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -17,7 +17,7 @@ sleep 3000
 print ======== step1
 
 
-sql create database db tables 4;
+sql create database db maxTables 4;
 sql use db
 
 
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
index 75603dcdd8b3b029714735707c7616758c40de3e..a836a8988128afaa5a81758448163e266213e713 100644
--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim
index 7afa42f0c4cea4fdbf51a8206391cf3e3141d582..a69e3fa019b716852aa76ad3c4f05d88f883b5ec 100644
--- a/tests/script/general/db/repeat.sim
+++ b/tests/script/general/db/repeat.sim
@@ -2,9 +2,9 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
index 3c63864e6f31b33d951fc6ac1cfe7a3aa278a58d..c5a4d1e530ed26eaafc3a6a7e9e63a7cf7be7d8f 100644
--- a/tests/script/general/db/testSuite.sim
+++ b/tests/script/general/db/testSuite.sim
@@ -1,12 +1,15 @@
+#run general//db/basic.sim
 run general/db/basic1.sim
 run general/db/basic2.sim
 run general/db/basic3.sim
 run general/db/basic4.sim
 run general/db/basic5.sim
-#run general//db/tables.sim
-#run general//db/basic.sim
-#run general//db/len.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_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/http/restful.sim b/tests/script/general/http/restful.sim
index c50273107fd6d30aa04a11998e6ee2d83bfc5014..894033e8f0c3eaff4e2fd1127f8901c3e1683498 100644
--- a/tests/script/general/http/restful.sim
+++ b/tests/script/general/http/restful.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index d125ccb56dc3e8bad87a2fb5e0e3397819c705e1..a4c1bd1851162b967a2bb0d5669a5e7727fc79b7 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim
index fb5eedff8eb3d0ff18e13eb6c3e24a1b45c9a0ee..1a14b5f00fde7894356b46a1236fd5ceb611d855 100644
--- a/tests/script/general/metrics/disk.sim
+++ b/tests/script/general/metrics/disk.sim
@@ -24,7 +24,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim
index ebd1f24225a3f58032674d9f776c2dd85b1e0a4b..b70253c5cd08bb6fbe97a08db09167348a492b7a 100644
--- a/tests/script/general/metrics/vnode3.sim
+++ b/tests/script/general/metrics/vnode3.sim
@@ -24,7 +24,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 8e691e496036ddcea7869cc09526e108dbcd5817..23cad7137e61a123a7bd51bdaed2bc04bc36349d 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 200 cache 2048 tables 4
+sql create database $db rows 200 cache 2048 maxTables 4
 print ====== create tables
 sql use $db
 
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 93b2bffeec5ee90fb15fc0466129fe8230475955..6c36f0645d16f55260f75031eb3fd4994ec381b0 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 400 cache 4096 tables 4
+sql create database $db rows 400 cache 4096 maxTables 4
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
 
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index fb129388a5a68bcf21125b560a8c2168466877ef..5bf41772ed8141bc6ecccec48237d6b859846deb 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -28,7 +28,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index 85ddb29066ad5287ad5c77e1637e620d408652f6..6addcb1ac194af250e4ff25493058d0a891056c3 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -24,7 +24,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 91cac9fbdb4fc8bd74d30c1c6eeba25cc80e0f82..86488ea8442fccecf35995fccd340afff4be96c7 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 83532cc10f6c2b41d2d09fbbb229274f11929077..c3d0e05aea279489f146d6a305fe903a432966d6 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
 
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 2c8bd0e11732abb99b95ec6b94fb6bb05d2d9df2..37ba1a8900cbba5460b2a51816a27c7a904bf8de 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -22,7 +22,7 @@ sql drop database if exists $db
 $paramRows = 200
 $rowNum = $paramRows * 4
 $rowNum = $rowNum / 5
-sql create database $db rows $paramRows tables 4
+sql create database $db rows $paramRows maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 5381ed7e8375831ebbf5dc30bbc3583bdb0aefbd..d990a79628e213502de73283999761755f572efa 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 350cb7669a96f49cd04fb8916cd97f50809ab8f2..181d7f312a14633abc5a86fa28eb19576f3cf72d 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -23,7 +23,7 @@ $tstart = 100000
 
 sql drop database if exists $db -x step1
 step1:
-sql create database if not exists $db tables 4 keep 36500
+sql create database if not exists $db maxTables 4 keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 07af4b9b27393277ae860909660d20f34b9a8e9e..759599b7b12f09f3cd0d1c1e6bc2ff9cf2b60d44 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -15,7 +15,7 @@ $db = $dbPrefix
 $stb = $stbPrefix
 
 sql drop database if exists $db
-sql create database $db rows 200 tables 4
+sql create database $db rows 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 3581c3a993b28952bb81d1a34b0e5969fb3f5259..18b8babf326756cd2454d99a49c0629c7564a57b 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -22,7 +22,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 tables 4
+sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 112a1c83773ff74ae3c6c176dfa81c3479bc357a..efc69531ed40d73b3ed137a6a77729d58d04a5b3 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 tables 4
+sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index c6671319b941dec41d67a92b8fc9ebea330221fc..c840bcf22e76c8db4da773c58464efde1e0674c4 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db tables 4
+sql create database if not exists $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
 
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim
index 81be2fe40ade255d453e50e0c1d8bf1f5de7088f..7dbab1eabb2eccc4867585d7cb1947b9e1ebf619 100644
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
@@ -17,7 +17,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =================== step 1
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql show vgroups
 if $rows != 0 then 
diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim
index f7eee1359b8b676134c521abc8d5276c3fbe7635..22c0333227103aada5fd0ad92bc7a0eddff5e5fc 100644
--- a/tests/script/general/user/pass_alter.sim
+++ b/tests/script/general/user/pass_alter.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim
index 583c2e73d37cad7808c0eb980ba99bdc59437eed..2a4a007a1abcf747840882cec431ebf9d59da368 100644
--- a/tests/script/general/user/pass_len.sim
+++ b/tests/script/general/user/pass_len.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim
index 4b81313695ad9b51e040ae2943f148f373c49372..cb75c2f5a699dcbe6f320d09cbccf358843fa798 100644
--- a/tests/script/general/user/user_create.sim
+++ b/tests/script/general/user/user_create.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim
index 4d2658cec955f58319ac9da9325d320bacbd7a4a..fa1fd5c4eaf4b701104e1dd6e4380236a559ffd6 100644
--- a/tests/script/general/user/user_len.sim
+++ b/tests/script/general/user/user_len.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
index 6ada0b4910018a1fb3afbc7237d5d58b38899038..30dd96075c0c72895a44650a430c92b696d559dc 100644
--- a/tests/script/unique/account/account_create.sim
+++ b/tests/script/unique/account/account_create.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
index 039f3816328bec2ec15c8ab21a3b90033b847ce8..71a75a7b350ce01ca7f0d2fac5e6d1ad3e7be0e9 100644
--- a/tests/script/unique/account/account_delete.sim
+++ b/tests/script/unique/account/account_delete.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
index eaa5873a1fd1e9bcb3528f04d74b4b259a122d86..ae2db26d58f5a51916eca2c7bd7ac675108ffbd5 100644
--- a/tests/script/unique/account/account_len.sim
+++ b/tests/script/unique/account/account_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
index ca9c68f57d9b60d02e44152b043c2b600048fc8c..fe978a5827c89d6a4b6aa2fa2c9b5fdadb4b7c5e 100644
--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
index 12a237c972874208d3fac6d15749fda0d6cc15d5..936611833a83148378802bbca3c7c14c1df56915 100644
--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
index b78c881c7fba2e7c559d01eeab411dc76b4224b0..f4f9c0496421d5e0c9c7a2545f6eedc36d5f9e06 100644
--- a/tests/script/unique/account/pass_len.sim
+++ b/tests/script/unique/account/pass_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
index ae15f8e02bd714b66364ced14aef608382c80fc3..075da848d613791593b453bf9cccf3ad265bf1df 100644
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
index 2122e7bd3fef45a2517dec31eff690b9c4180be5..fcc344d115e07d0bb79f5ee0ba98cd4f731bc040 100644
--- a/tests/script/unique/account/user_len.sim
+++ b/tests/script/unique/account/user_len.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sql connect
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 270c3810a703edaa8d09e733b685689164248068..3d4d39af536a3ccb5ffbb609a36b3dcc34413e4c 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -1,23 +1,23 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c tables -v 1000
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c tables -v 1000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c tables -v 1000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode4 -c tables -v 1000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 1000
 
 system sh/deploy.sh -n dnode5 -i 5
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode5 -c tables -v 1000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 1000
 
 print =============== prepare data
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
index 638febd3dbebb062c49b576c090c0d8161b2d9b1..424a80d25aa397837fd4598ccd0a48c77e27f140 100644
--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -35,21 +35,21 @@ system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 print ============== step1
 print ========= start dnode1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create database c_b1_d1 tables 4
+sql create database c_b1_d1 maxTables 4
 sql use c_b1_d1
 
 sql create table c_b1_t1 (t timestamp, i int)
@@ -59,7 +59,7 @@ sql insert into c_b1_t1 values(1520000022013, 13)
 sql insert into c_b1_t1 values(1520000023012, 12)
 sql insert into c_b1_t1 values(1520000024011, 11)
 
-sql create database c_b1_d2 tables 4
+sql create database c_b1_d2 maxTables 4
 sql use c_b1_d2
 sql create table c_b1_t2 (t timestamp, i int)
 sql insert into c_b1_t2 values(1520000020025, 25)
@@ -116,7 +116,7 @@ print dnode2 ==> $dnode2Role
 
 print ============================== step3
 print ========= add db3
-sql create database c_b1_d3 tables 4
+sql create database c_b1_d3 maxTables 4
 sql use c_b1_d3
 sql create table c_b1_t3 (t timestamp, i int)
 sql insert into c_b1_t3 values(1520000020035, 35)
@@ -289,7 +289,7 @@ if $dnode4Role != slave then
 endi
 
 print ============================== step10
-sql create database c_b1_d4 tables 4
+sql create database c_b1_d4 maxTables 4
 sql use c_b1_d4
 sql create table c_b1_t4 (t timestamp, i int)
 sql insert into c_b1_t4 values(1520000020045, 45)
@@ -327,7 +327,7 @@ sql use c_b1_d2
 sql insert into c_b1_t2 values(1520000025026, 26)
 
 print ============================== step12
-sql create database c_b1_d5 tables 4
+sql create database c_b1_d5 maxTables 4
 sql use c_b1_d5
 sql_error create table c_b1_t5 (t timestamp, i int) -x error3
 
@@ -352,7 +352,7 @@ sql insert into c_b1_t5 values(1520000022053, 53)
 sql insert into c_b1_t5 values(1520000023052, 52)
 sql insert into c_b1_t5 values(1520000024051, 51)
 
-sql create database c_b1_d6 tables 4
+sql create database c_b1_d6 maxTables 4
 sql use c_b1_d6
 sql create table c_b1_t6 (t timestamp, i int)
 sql insert into c_b1_t6 values(1520000020065, 65)
@@ -384,7 +384,7 @@ sql create dnode $hostname6
 system sh/exec_up.sh -n dnode6 -s start
 sleep 15000
 
-sql create database c_b1_d7 tables 4
+sql create database c_b1_d7 maxTables 4
 sql use c_b1_d7
 sql create table c_b1_t7 (t timestamp, i int)
 sql insert into c_b1_t7 values(1520000020075, 75)
@@ -393,7 +393,7 @@ sql insert into c_b1_t7 values(1520000022073, 73)
 sql insert into c_b1_t7 values(1520000023072, 72)
 sql insert into c_b1_t7 values(1520000024071, 71)
 
-sql create database c_b1_d8 tables 4
+sql create database c_b1_d8 maxTables 4
 sql use c_b1_d8
 sql create table c_b1_t8 (t timestamp, i int)
 sql insert into c_b1_t8 values(1520000020085, 85)
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
index 10de862b7f51d0c5c7f4e65c551355736d9fec23..08fdd233e012f89a29bcaca938fb34f73aeb224a 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -26,14 +26,14 @@ system sh/cfg.sh -n dnode6 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode7 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode8 -c numOfMPeers -v 3
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
@@ -56,7 +56,7 @@ system sh/exec_up.sh -n dnode2 -s start
 system sh/exec_up.sh -n dnode3 -s start
 sleep 4001
 
-sql create database c_b2_d1 replica 2 tables 4
+sql create database c_b2_d1 replica 2 maxTables 4
 sql use c_b2_d1
 sql create table c_b2_t1 (t timestamp, i int)
 sql insert into c_b2_t1 values(1520000020015, 15)
@@ -65,7 +65,7 @@ sql insert into c_b2_t1 values(1520000022013, 13)
 sql insert into c_b2_t1 values(1520000023012, 12)
 sql insert into c_b2_t1 values(1520000024011, 11)
 
-sql create database c_b2_d2 replica 2 tables 4
+sql create database c_b2_d2 replica 2 maxTables 4
 sql use c_b2_d2
 sql create table c_b2_t2 (t timestamp, i int)
 sql insert into c_b2_t2 values(1520000020025, 25)
@@ -74,7 +74,7 @@ sql insert into c_b2_t2 values(1520000022023, 23)
 sql insert into c_b2_t2 values(1520000023022, 22)
 sql insert into c_b2_t2 values(1520000024021, 21)
 
-sql create database c_b2_d3 replica 2 tables 4
+sql create database c_b2_d3 replica 2 maxTables 4
 sql use c_b2_d3
 sql create table c_b2_t3 (t timestamp, i int)
 sql insert into c_b2_t3 values(1520000020035, 35)
diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim
index cb453151e45bd5f3772b49c3efffbb5ee81fc346..52ef045b8018111bd6051cc101cac591f0833e1e 100644
--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -36,14 +36,14 @@ system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
-system sh/cfg.sh -n dnode7 -c clog -v 1
-system sh/cfg.sh -n dnode8 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
 
 print ============== step1
 print ========= start dnode1
@@ -340,6 +340,21 @@ sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============================== step9.1
+system sh/exec_up.sh -n dnode1 -s start
+
 $x = 0
 show9: 
 	$x = $x + 1
diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim
index 6390578867b95c53cd6778b0498d37fc04b24bf8..4b08b13e2fb08f36e5e19886d5acf02dfdb98e3c 100644
--- a/tests/script/unique/column/replica3.sim
+++ b/tests/script/unique/column/replica3.sim
@@ -3,9 +3,9 @@ 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
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index ed41f1bb90c48da0ce07cb26f83c75dbf90a16d0..f499b7172746c7fea126d70ac37139ad7a0389f4 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -6,9 +6,9 @@ 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/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
index 7e4e1b0b965cc7913ca6c53a7a45766c2cb1fc14..3ed4f5d7534595d1701446df585b601efef29a6e 100644
--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -9,10 +9,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c tables -v 4
-system sh/cfg.sh -n dnode2 -c tables -v 4
-system sh/cfg.sh -n dnode3 -c tables -v 4
-system sh/cfg.sh -n dnode4 -c tables -v 4
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim
index 14956e56c2833ae837e1d62a17e005eedcc9e167..5d1ec794509537e0bc4f428492d3bb68744e177a 100644
--- a/tests/script/unique/db/replica_add12.sim
+++ b/tests/script/unique/db/replica_add12.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim
index 970545ae01ab580515dd61738abfc238416fa29a..ac7e3f5c5c13dcd4f126456e15124ce3778a85c8 100644
--- a/tests/script/unique/db/replica_add13.sim
+++ b/tests/script/unique/db/replica_add13.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim
index d4aa85c05c5da91e0c18b7c61bd4d0c5b159b404..995cd4116c307b5c0fe9cb37f7993d724da3cd70 100644
--- a/tests/script/unique/db/replica_add23.sim
+++ b/tests/script/unique/db/replica_add23.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim
index 29b16c8018b02e6cbfa8bb2fd6753726e39bea45..f0ffb8901526f59ae30f5bd43e89010b2bdf454f 100644
--- a/tests/script/unique/db/replica_part.sim
+++ b/tests/script/unique/db/replica_part.sim
@@ -4,9 +4,9 @@ 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/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim
index e86ff9367f5d38340fa2c61a2d75e3b7aa078e92..3a324c604a55f0be44bb1be94991f17007ba933c 100644
--- a/tests/script/unique/db/replica_reduce21.sim
+++ b/tests/script/unique/db/replica_reduce21.sim
@@ -4,9 +4,9 @@ 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/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim
index 6b4264e9e1f909a216e6aa1571998fa87fefed6d..fdb5e3c1dc813d88cbbca7682ee4812b5168fb46 100644
--- a/tests/script/unique/db/replica_reduce31.sim
+++ b/tests/script/unique/db/replica_reduce31.sim
@@ -4,9 +4,9 @@ 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/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim
index d59fb1fc0ad3852130e5870f5128430d4a44397c..83b5cb7a5bc20fa2f19963db1b5f1cd881449de4 100644
--- a/tests/script/unique/db/replica_reduce32.sim
+++ b/tests/script/unique/db/replica_reduce32.sim
@@ -4,9 +4,9 @@ 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/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim
index 5e5e9e097be860446f0525357b9ca3141483b825..79f22c42ff6cd875af09b3baf56fef8a57872347 100644
--- a/tests/script/unique/dnode/balance1.sim
+++ b/tests/script/unique/dnode/balance1.sim
@@ -15,22 +15,22 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -68,7 +68,7 @@ if $data2_2 != 1 then
 endi
 
 print ========== step3
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -139,7 +139,7 @@ if $data2_3 != 2 then
 endi
 
 print ========== step6
-sql create database d3 tables 4
+sql create database d3 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -193,7 +193,7 @@ if $data2_4 != 1 then
 endi
 
 print ========== step8
-sql create database d4 tables 4
+sql create database d4 maxTables 4
 sql create table d4.t4 (t timestamp, i int)
 sql insert into d4.t4 values(now+1s, 45)
 sql insert into d4.t4 values(now+2s, 44)
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
index e27262bf1d8f9c1e6a21d56aa3b72c306469821b..4518c4262230f15c1f2e7d4e3cfe06ddc1960600 100644
--- a/tests/script/unique/dnode/balance2.sim
+++ b/tests/script/unique/dnode/balance2.sim
@@ -12,11 +12,11 @@ system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -28,7 +28,7 @@ system sh/exec_up.sh -n dnode2 -s start
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 
-sql create database d1 replica 2  tables 4
+sql create database d1 replica 2  maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -36,7 +36,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 2  tables 4
+sql create database d2 replica 2  maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -116,7 +116,7 @@ if $data2_4 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim
index 112afed6a1212e45f849ada7c45c0c77e12de3cc..acb0d033d4a21ed7bb262b9437cdb4d404fe437f 100644
--- a/tests/script/unique/dnode/balance3.sim
+++ b/tests/script/unique/dnode/balance3.sim
@@ -14,12 +14,12 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
-system sh/cfg.sh -n dnode5 -c clog -v 1
-system sh/cfg.sh -n dnode6 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -33,7 +33,7 @@ system sh/exec_up.sh -n dnode3 -s start
 system sh/exec_up.sh -n dnode4 -s start
 sleep 3000
 
-sql create database d1 replica 3  tables 4
+sql create database d1 replica 3  maxTables 4
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15) 
 sql insert into d1.t1 values(now+2s, 14)
@@ -41,7 +41,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 3  tables 4
+sql create database d2 replica 3  maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -136,7 +136,7 @@ if $data2_5 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 3 tables 4
+sql create database d3 replica 3 maxTables 4
 sql create table d3.t3 (t timestamp, i int) 
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
index af163ab5fac38412f7afa73e9e9e0568b938e979..d717250a796af420ef589f43b176a137b4460271 100644
--- a/tests/script/unique/dnode/balancex.sim
+++ b/tests/script/unique/dnode/balancex.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -65,7 +65,7 @@ if $data2_2 != 2 then
 endi
 
 print ========== step3
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
index fda7f4ad77150caf5a18d769e8574ed0e9ecea1e..8726caf1db8d43f4418c6873fbd96cf46dd46579 100644
--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -6,8 +6,8 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
 
 system sh/cfg.sh -n dnode1 -c monitor -v 1
 system sh/cfg.sh -n dnode2 -c monitor -v 0
diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim
index 64ba981d1fb2052a8ff421e3e2bfe439477a71d8..5e4ab65be37e90a4cf6737d6fa7b485c16dd61ae 100644
--- a/tests/script/unique/dnode/offline1.sim
+++ b/tests/script/unique/dnode/offline1.sim
@@ -16,9 +16,9 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
index ae9b13079fee7dace74450a16ac9137ea0b58548..2615746e05ab0dcfb22caccd42f4fc3cead7e931 100644
--- a/tests/script/unique/dnode/offline2.sim
+++ b/tests/script/unique/dnode/offline2.sim
@@ -16,9 +16,9 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
@@ -27,7 +27,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 
-sql create database d1 replica 2 tables 4
+sql create database d1 replica 2 maxTables 4
 sql create table d1.t1(ts timestamp, i int)
 sql insert into d1.t1 values(now, 1)
 
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
index c345aa202b2a7cd9268d7ff58c2701dec39b6106..c69c51fa96ba1c18f93bd1d0ec6f1043e4d412cb 100644
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index 909f82e61c9411cd3d97d8e7ef3a6714a450c428..c9e48d9283c929ef388fcf38f27342dd8c01dbd0 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -10,17 +10,17 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 tables 4
+sql create database d3 replica 2 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
index 3693868497f4d5c443dccd51f7b6ba57d39683da..6b3c8ebeb243b96cad8b4b33ede5ad92977a2f41 100644
--- a/tests/script/unique/dnode/vnode_clean.sim
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -10,16 +10,16 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
 
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create database d1 tables 4
+sql create database d1 maxTables 4
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -55,7 +55,7 @@ if $data2_2 != 3 then
 endi
 
 print ========== step3
-sql create database d2 tables 4
+sql create database d2 maxTables 4
 
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
@@ -107,7 +107,7 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c clog -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -128,7 +128,7 @@ if $data2_2 != 2 then
 endi
 
 print ========== step6
-sql create database d3 tables 4
+sql create database d3 maxTables 4
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
index ca2adc29ab83787ee90b681750607f79774ca294..51307af00e6447d93060f0e9198a55f29c29dcc0 100644
--- a/tests/script/unique/http/admin.sim
+++ b/tests/script/unique/http/admin.sim
@@ -2,7 +2,7 @@ system sh/stop_dnodes.sh
 
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c http -v 1
-system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
index 3c59a734548f330aeb57b4fb08c6ba576bc27338..d1b193173e451f7c01829608c8a7845b1d58ba17 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.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 clog -v 0
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim
index cab3c1a80708d5b991eba4db4ebdf9110322155d..f819a87e8c4ce8c3ed4c95665343d4d290a75dbe 100644
--- a/tests/script/unique/metrics/balance_replica1.sim
+++ b/tests/script/unique/metrics/balance_replica1.sim
@@ -34,7 +34,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim
index 2156dc40d807bea4759a61aff184c77896929f47..dfcead7dbeb499f219ff153e98c2a7d558b10a5c 100644
--- a/tests/script/unique/metrics/dnode2.sim
+++ b/tests/script/unique/metrics/dnode2.sim
@@ -43,7 +43,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim
index be6ec735a1b89696a43db5f407d3b96fc2366936..eaa73253ea6de0e679c6d464855a2d5d4649663b 100644
--- a/tests/script/unique/metrics/dnode2_stop.sim
+++ b/tests/script/unique/metrics/dnode2_stop.sim
@@ -48,7 +48,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim
index 3fd54adfba07ac98e22d1899884519791695ddcd..9b5bf4cba94ccc100ecbcc343a22618d906dd4d0 100644
--- a/tests/script/unique/metrics/dnode3.sim
+++ b/tests/script/unique/metrics/dnode3.sim
@@ -54,7 +54,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim
index c5096ca03cb470ae94d0180263cc7c18cb65d7de..7fbf89d767762a94d26dd774333c58aa8be13110 100644
--- a/tests/script/unique/metrics/replica2_dnode4.sim
+++ b/tests/script/unique/metrics/replica2_dnode4.sim
@@ -63,7 +63,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 tables 4
+sql create database $db replica 2 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim
index 937c78cb8b68573df73abfeba01eddf16855c718..37f0db05f90dc5c9e4fa21e18329b0bfe0ec8b3d 100644
--- a/tests/script/unique/metrics/replica2_vnode3.sim
+++ b/tests/script/unique/metrics/replica2_vnode3.sim
@@ -42,7 +42,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 tables 4
+sql create database $db replica 2 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim
index c3592a88f2c55ee9ab80ac140adbf869102a8462..f023ab1c724357319d4a8937d7ac881c99a13b8c 100644
--- a/tests/script/unique/metrics/replica3_dnode6.sim
+++ b/tests/script/unique/metrics/replica3_dnode6.sim
@@ -93,7 +93,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 tables 4
+sql create database $db replica 3 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim
index 4da34fc92a44d54c177f832bc2d5c1f09528427a..549500439b547fb55b6f248a3cd354783e5ac5d9 100644
--- a/tests/script/unique/metrics/replica3_vnode3.sim
+++ b/tests/script/unique/metrics/replica3_vnode3.sim
@@ -62,7 +62,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 tables 4
+sql create database $db replica 3 maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
index fcdb7df206ddefef87b6be67a2908548c3297ac7..d3da7b43d14c649cc8119935d0832e0c8b5164f9 100644
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -36,7 +36,7 @@ sql connect
 
 print ============== step1
 $db = $dbPrefix
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 
 $i = 0
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
index 6d2e7de57aaf3df2eb2a21b09c956b8f29292e89..a0a83c7cef7a7fbbc1faeb99b3faad0d28696dd2 100644
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
@@ -38,7 +38,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
index 3096bcc9f94c65244c436cf39d7224eb82e4c2be..eb99b93932246e86ce61973beb9fae607c3eda80 100644
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
@@ -25,10 +25,10 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
 
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
@@ -75,7 +75,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 $st = $stPrefix . $i
 
-sql create database $db tables 4
+sql create database $db maxTables 4
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim
index 7383934aacb51619442bf09faa3507dcfab16c76..dae657166719b44753eb035b151b6f8a719155c3 100644
--- a/tests/script/unique/vnode/commit.sim
+++ b/tests/script/unique/vnode/commit.sim
@@ -2,8 +2,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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
+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 numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
index 57e0d10b7e8bad79e24993e9a7c5e8dc82825f6e..544f7d5b55870abe6e2357991c4e76721d8cc70f 100644
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim
index c71692fa9f1ec3f3bc253b6ac2970f137d51e66e..8e18c3b9e77b868d00bbbfc05bff0021658ce88c 100644
--- a/tests/script/unique/vnode/replica2_basic.sim
+++ b/tests/script/unique/vnode/replica2_basic.sim
@@ -2,8 +2,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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
+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 numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim
index dd0914549a09550a807b476bd575cb0613e021d0..a86071faafec08627b69da1777aeec6d8b8977e4 100644
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@@ -5,10 +5,10 @@ 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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index 46fe90cfde6eccc4239957b017f4410c153a675e..cc1feecb07b2802146d8eb3789dbe1713d03e6b0 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim
index 542aa7803d31a9f06f3abb0c0b166741377c3f7b..62910b947afdd5f3483c6d8e3ced05098ba3ac7e 100644
--- a/tests/script/unique/vnode/replica3_basic.sim
+++ b/tests/script/unique/vnode/replica3_basic.sim
@@ -3,9 +3,9 @@ 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
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index 67ac673bfcc2308fcf43c90e16f10be0c39a7c76..0ed16e0729edfd5ac1843b3886ef2ba50f9796a7 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.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 clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
-system sh/cfg.sh -n dnode4 -c clog -v 2
+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 numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
index 46003a14fa208f875833e102a58b489124b2bb3f..077c1e2e49efde127dc72117ea700f3ec5676679 100644
--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -3,9 +3,9 @@ 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
-system sh/cfg.sh -n dnode1 -c clog -v 2
-system sh/cfg.sh -n dnode2 -c clog -v 2
-system sh/cfg.sh -n dnode3 -c clog -v 2
+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 dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3