diff --git a/testsuite/expect/test21.13 b/testsuite/expect/test21.13
index d92a4ee465337ea9e772ee1edb5ae4a1eb0b422a..60035fbe4d68c13e30ed4de28fb991aba0f2f09c 100755
--- a/testsuite/expect/test21.13
+++ b/testsuite/expect/test21.13
@@ -92,7 +92,7 @@ if {$access_err != 0} {
 remove_acct "" "$nm1,$nm2,$nm3"
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_acct "" "$nm1,$nm2,$nm3"
 	remove_cluster "$tc1,$tc2"
diff --git a/testsuite/expect/test21.14 b/testsuite/expect/test21.14
index 0171b429714ebefd3a62cdcd77c0635a27d7b447..e4f97c8f01259e5b85f65cf415b84dc6295f113c 100755
--- a/testsuite/expect/test21.14
+++ b/testsuite/expect/test21.14
@@ -90,7 +90,7 @@ if {$access_err != 0} {
 remove_acct "" "$nm1,$nm2,$nm3"
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_acct "" "$nm1,$nm2,$nm3"
 	remove_cluster "$tc1,$tc2"
diff --git a/testsuite/expect/test21.15 b/testsuite/expect/test21.15
index b3cd8ca3a99e80a7f6eb65586826185133479124..b9ffde2128c4bac6c01302187164a4d29daa6558 100755
--- a/testsuite/expect/test21.15
+++ b/testsuite/expect/test21.15
@@ -118,7 +118,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test21.16 b/testsuite/expect/test21.16
index 8690f6723fbf8accb41afb97b9ca4f3d0ba7d623..7c3c26d77f21d6e38b623b2de7bf6eb6b2f22185 100755
--- a/testsuite/expect/test21.16
+++ b/testsuite/expect/test21.16
@@ -118,7 +118,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test21.17 b/testsuite/expect/test21.17
index 99d26fea33afdf7f1875954680672f2c3f5bc1a1..e3e87e9ef0939932633cc915609b603c77d689fd 100755
--- a/testsuite/expect/test21.17
+++ b/testsuite/expect/test21.17
@@ -118,7 +118,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
      	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test21.18 b/testsuite/expect/test21.18
index 68a37372956ca1282def707e7bf40df30393f13b..4e3bc716297acaaca40582547ef6bb911829cd1b 100755
--- a/testsuite/expect/test21.18
+++ b/testsuite/expect/test21.18
@@ -118,7 +118,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index 6f96b8431a3d6c26110712f11de36e8f5937eb42..5061c6994268f25c1d9108cdfdb5968bb9e68d70 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -118,7 +118,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test21.20 b/testsuite/expect/test21.20
index deb670a0caf20c4c711f937f072f61f7c91c621f..aeb2c31e440579853a63dab01454e6ea3e3f2237 100755
--- a/testsuite/expect/test21.20
+++ b/testsuite/expect/test21.20
@@ -123,7 +123,7 @@ if {$access_err != 0} {
 }
 
 #add cluster
-incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$tc1,$tc2,$tc3" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
 	remove_user "" "" "$us1,$us2,$us3"
 	remove_acct "" "$nm1,$nm2,$nm3"
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index 0f7a2e26ff92e1ea830c7a26fb38f61511be6018..32fb4a3d282047b8ed198fe2a64281d8ecbd5c3b 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -147,7 +147,7 @@ remove_user "" "" $users
 remove_acct "" $accounts
 remove_cluster "$cluster"
 #add cluster
-incr exit_code [add_cluster "$cluster" "" "" "" "" "" "" "" "" "" "" "" "" "" ""]
+incr exit_code [add_cluster "$cluster" "" "" "" "" "" "" "" "" "" "" "" ""]
 if { $exit_code } {
  	remove_cluster "$cluster"
 	exit $exit_code