diff --git a/tests/acceptance/semiautomation/helper.fish b/tests/acceptance/semiautomation/helper.fish
index b4ed8881f..b932ea022 100644
--- a/tests/acceptance/semiautomation/helper.fish
+++ b/tests/acceptance/semiautomation/helper.fish
@@ -14,7 +14,7 @@ function waitForKubectl
   set -l select $argv[2]
   set -l good (string split -- ";" "$argv[3]")
   set -l expected $argv[4]
-  set -l timeout $argv[5]
+  set -l timeout (math "$argv[5]" \* "$TIMEOUT")
    
   echo
   echo "Testing `kubectl $op`"
@@ -42,8 +42,8 @@ function waitForKubectl
 end
 
 function output
-  if which say > /dev/null
-    say $argv[1] > /dev/null ^ /dev/null
+  if test -n "$SAY"
+    eval $SAY $argv[1] > /dev/null ^ /dev/null
   end
   echo
   for l in $argv[2..-1] ; echo $l ; end
@@ -71,7 +71,7 @@ end
 
 function testArangoDB
   set -l ip $argv[1]
-  set -l timeout $argv[2]
+  set -l timeout (math "$argv[2]" \* "$TIMEOUT")
   set -l n 0
   echo Waiting for ArangoDB to be ready...
   while true
@@ -114,3 +114,14 @@ function checkImages
     exit 1
   end
 end
+
+if test -z "$TIMEOUT"
+  set -xg TIMEOUT 60
+end
+
+if test -z "$SAY"
+  if which say > /dev/null
+    set -xg SAY say
+  end
+end
+
diff --git a/tests/acceptance/semiautomation/test1a.fish b/tests/acceptance/semiautomation/test1a.fish
index c0f7669e0..3fc40807e 100755
--- a/tests/acceptance/semiautomation/test1a.fish
+++ b/tests/acceptance/semiautomation/test1a.fish
@@ -13,14 +13,14 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -29,7 +29,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test1b.fish b/tests/acceptance/semiautomation/test1b.fish
index 9083d716a..097670ccd 100755
--- a/tests/acceptance/semiautomation/test1b.fish
+++ b/tests/acceptance/semiautomation/test1b.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test1c.fish b/tests/acceptance/semiautomation/test1c.fish
index d95f1d2e1..08047fa0c 100755
--- a/tests/acceptance/semiautomation/test1c.fish
+++ b/tests/acceptance/semiautomation/test1c.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test1d.fish b/tests/acceptance/semiautomation/test1d.fish
index df81e9720..1e54c002e 100755
--- a/tests/acceptance/semiautomation/test1d.fish
+++ b/tests/acceptance/semiautomation/test1d.fish
@@ -13,20 +13,20 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 15 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-syma" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sywo" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 15 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-syma" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sywo" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -35,7 +35,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test2a.fish b/tests/acceptance/semiautomation/test2a.fish
index 7a7551362..53eeb1232 100755
--- a/tests/acceptance/semiautomation/test2a.fish
+++ b/tests/acceptance/semiautomation/test2a.fish
@@ -13,32 +13,32 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Scale up the deployment
 output "Next" "Patching Spec for Scaling up"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/single/count", "value":3}]'
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 6 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 2 120
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 6 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 2 2
 or fail "Patched deployment did not get ready."
 
 # Scale down the deployment
 output "Next" "Patching Spec for Scaling down"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/single/count", "value":2}]'
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
 or fail "Patched deployment did not get ready."
 
 # Manual check
@@ -47,7 +47,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test2b.fish b/tests/acceptance/semiautomation/test2b.fish
index c0a558d6b..05ad886b4 100755
--- a/tests/acceptance/semiautomation/test2b.fish
+++ b/tests/acceptance/semiautomation/test2b.fish
@@ -13,53 +13,53 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Patching
 output "Scaling db servers up" "Patching Spec for Scaling up DBservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":5}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 11 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 11 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling coordinators up" "Patching Spec for Scaling up coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":4}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 12 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 12 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling dbservers down" "Patching Spec for Scaling down dbservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":2}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling coordinators down" "Patching Spec for Scaling down coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":1}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 6 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 1 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 6 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 1 2
 or fail "Deployment did not get ready."
 
 # Manual check
@@ -68,7 +68,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 0 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3a.fish b/tests/acceptance/semiautomation/test3a.fish
index f0d20b5a6..a6f03b0c7 100755
--- a/tests/acceptance/semiautomation/test3a.fish
+++ b/tests/acceptance/semiautomation/test3a.fish
@@ -13,14 +13,14 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -29,7 +29,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3b.fish b/tests/acceptance/semiautomation/test3b.fish
index 1fb1135da..3641dcc50 100755
--- a/tests/acceptance/semiautomation/test3b.fish
+++ b/tests/acceptance/semiautomation/test3b.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3c.fish b/tests/acceptance/semiautomation/test3c.fish
index 5d9025a64..bdc1928ec 100755
--- a/tests/acceptance/semiautomation/test3c.fish
+++ b/tests/acceptance/semiautomation/test3c.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3d.fish b/tests/acceptance/semiautomation/test3d.fish
index e99e8dcc5..6391de896 100755
--- a/tests/acceptance/semiautomation/test3d.fish
+++ b/tests/acceptance/semiautomation/test3d.fish
@@ -13,53 +13,53 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Patching
 output "Scaling dbservers down" "Patching Spec for Scaling down dbservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":2}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 8 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 8 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling coordinators down" "Patching Spec for Scaling down coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":2}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 7 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 2 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 7 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 2 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling db servers up" "Patching Spec for Scaling up DBservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":3}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 8 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 2 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 8 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 2 2
 or fail "Deployment did not get ready."
 
 # Patching
 output "Scaling coordinators up" "Patching Spec for Scaling up coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":3}]'
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
 or fail "Deployment did not get ready."
 
 # Manual check
@@ -68,7 +68,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 0 120
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test4a.fish b/tests/acceptance/semiautomation/test4a.fish
index ef0402545..2d84099dc 100755
--- a/tests/acceptance/semiautomation/test4a.fish
+++ b/tests/acceptance/semiautomation/test4a.fish
@@ -14,22 +14,22 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy local storage:
 kubectl apply -f $YAMLFILESTORAGE
-and waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 1 60
+and waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 1 1
 or fail "Local storage could not be deployed."
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get pvc" "$DEPLOYMENT" "RWO *acceptance" 6 120
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get pvc" "$DEPLOYMENT" "RWO *acceptance" 6 2
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -38,12 +38,12 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 kubectl delete -f $YAMLFILESTORAGE
 kubectl delete storageclass acceptance
-waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 0 120
+waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 0 2
 or fail "Could not delete deployed storageclass."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test4b.fish b/tests/acceptance/semiautomation/test4b.fish
index d287685ba..19431ca03 100755
--- a/tests/acceptance/semiautomation/test4b.fish
+++ b/tests/acceptance/semiautomation/test4b.fish
@@ -14,22 +14,22 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
 
 # Deploy local storage:
 kubectl apply -f $YAMLFILESTORAGE
-and waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 1 60
+and waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 1 1
 or fail "Local storage could not be deployed."
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get pvc" "$DEPLOYMENT" "RWO *standard" 6 120
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get pvc" "$DEPLOYMENT" "RWO *standard" 6 2
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -38,12 +38,12 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 kubectl delete -f $YAMLFILESTORAGE
 kubectl delete storageclass acceptance
-waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 0 120
+waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 0 2
 or fail "Could not delete deployed storageclass."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test5a.fish b/tests/acceptance/semiautomation/test5a.fish
index f8166dd88..3f0a40635 100755
--- a/tests/acceptance/semiautomation/test5a.fish
+++ b/tests/acceptance/semiautomation/test5a.fish
@@ -13,14 +13,14 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -29,7 +29,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test5b.fish b/tests/acceptance/semiautomation/test5b.fish
index 5b7b0811a..fa43b4c4a 100755
--- a/tests/acceptance/semiautomation/test5b.fish
+++ b/tests/acceptance/semiautomation/test5b.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test5c.fish b/tests/acceptance/semiautomation/test5c.fish
index 4a1ca7148..f8452c698 100755
--- a/tests/acceptance/semiautomation/test5c.fish
+++ b/tests/acceptance/semiautomation/test5c.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6a.fish b/tests/acceptance/semiautomation/test6a.fish
index 4f2507818..345e342f7 100755
--- a/tests/acceptance/semiautomation/test6a.fish
+++ b/tests/acceptance/semiautomation/test6a.fish
@@ -13,14 +13,14 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -29,7 +29,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6b.fish b/tests/acceptance/semiautomation/test6b.fish
index 60fc5b156..8700b4b98 100755
--- a/tests/acceptance/semiautomation/test6b.fish
+++ b/tests/acceptance/semiautomation/test6b.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6c.fish b/tests/acceptance/semiautomation/test6c.fish
index d02555964..a76ca88ac 100755
--- a/tests/acceptance/semiautomation/test6c.fish
+++ b/tests/acceptance/semiautomation/test6c.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6d.fish b/tests/acceptance/semiautomation/test6d.fish
index 0b7b1ae22..289c6e8d5 100755
--- a/tests/acceptance/semiautomation/test6d.fish
+++ b/tests/acceptance/semiautomation/test6d.fish
@@ -13,14 +13,14 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -29,7 +29,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6e.fish b/tests/acceptance/semiautomation/test6e.fish
index 64a0999fa..8424924a5 100755
--- a/tests/acceptance/semiautomation/test6e.fish
+++ b/tests/acceptance/semiautomation/test6e.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6f.fish b/tests/acceptance/semiautomation/test6f.fish
index 51ed20428..728e6c82c 100755
--- a/tests/acceptance/semiautomation/test6f.fish
+++ b/tests/acceptance/semiautomation/test6f.fish
@@ -13,16 +13,16 @@ patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Production work.yaml
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
@@ -31,7 +31,7 @@ inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test6g.fish b/tests/acceptance/semiautomation/test6g.fish
index ddeb11560..a5506a6d3 100755
--- a/tests/acceptance/semiautomation/test6g.fish
+++ b/tests/acceptance/semiautomation/test6g.fish
@@ -4,34 +4,46 @@ source helper.fish
 checkImages
 
 set -g TESTNAME test6g
-set -g TESTDESC "Node resilience in active/failover, repl factor 1 (production)"
-set -g YAMLFILE activefailover.yaml
-set -g DEPLOYMENT acceptance-activefailover
+set -g TESTDESC "Node resilience in mode cluster (development, enterprise, local storage)"
+set -g YAMLFILE cluster-local-storage.yaml
+set -g YAMLFILESTORAGE local-storage.yaml
+set -g DEPLOYMENT acceptance-cluster
 printheader
 
-patchYamlFile $YAMLFILE $ARANGODB_COMMUNITY Production work.yaml
+patchYamlFile $YAMLFILE $ARANGODB_ENTERPRISE Development work.yaml
+
+# Deploy local storage:
+kubectl apply -f $YAMLFILESTORAGE
+and waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 1 1
+or fail "Local storage could not be deployed."
 
 # Deploy and check
 kubectl apply -f work.yaml
-and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get pvc" "$DEPLOYMENT" "RWO *acceptance" 6 2
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB was not reachable."
 
 # Manual check
-output "Work" "Now please check external access on this URL with your browser:" "  https://$ip:8529/" "then type the outcome followed by ENTER." "Furthermore, put some data in, use replication factor 1 for one collection." "Then, remove the node on which the dbserver pod with the shard resides." "The lost pods should come back (on a different machine), except the one." "The service should be uninterrupted, except for the one collection." "All data except the one must still be there." "This is only for locally attached persistent volumes."
+output "Work" "Now please check external access on this URL with your browser:" "  https://$ip:8529/" "then put some data in there in different collections, some with" "replicationFactor set to 1 and some set to 2." "Then cordon off a node running a dbserver pod and delete the pod." "Service (including writes) must continue, except for the collection without" "replication. It should be possible to drop that collection and eventually" "remove the dbserver. A new dbserver should come up on a different node" "after some time."
 inputAndLogResult
 
 # Cleanup
 kubectl delete -f work.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
 or fail "Could not delete deployment."
 
+kubectl delete -f $YAMLFILESTORAGE
+kubectl delete storageclass acceptance
+waitForKubectl "get storageclass" "acceptance.*arangodb.*localstorage" "" 0 2
+or fail "Could not delete deployed storageclass."
+
 output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test7a.fish b/tests/acceptance/semiautomation/test7a.fish
index 3e0ecb339..237aec924 100755
--- a/tests/acceptance/semiautomation/test7a.fish
+++ b/tests/acceptance/semiautomation/test7a.fish
@@ -18,24 +18,24 @@ cp replication.yaml work3.yaml
 # Deploy and check
 kubectl apply -f work.yaml
 kubectl apply -f work2.yaml
-and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 15 120
-and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-syma" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT-sywo" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get pod" "$DEPLOYMENT2" "1/1 *Running" 15 120
-and waitForKubectl "get pod" "$DEPLOYMENT2-prmr" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT2-agnt" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT2-crdn" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT2-syma" "1/1 *Running" 3 120
-and waitForKubectl "get pod" "$DEPLOYMENT2-sywo" "1/1 *Running" 3 120
-and waitForKubectl "get service" "$DEPLOYMENT2 *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT2-ea *LoadBalancer" "-v;pending" 1 180
-and waitForKubectl "get service" "$DEPLOYMENT2-sync *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 15 2
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-syma" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT-sywo" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get pod" "$DEPLOYMENT2" "1/1 *Running" 15 2
+and waitForKubectl "get pod" "$DEPLOYMENT2-prmr" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT2-agnt" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT2-crdn" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT2-syma" "1/1 *Running" 3 2
+and waitForKubectl "get pod" "$DEPLOYMENT2-sywo" "1/1 *Running" 3 2
+and waitForKubectl "get service" "$DEPLOYMENT2 *ClusterIP" 8529 1 2
+and waitForKubectl "get service" "$DEPLOYMENT2-ea *LoadBalancer" "-v;pending" 1 3
+and waitForKubectl "get service" "$DEPLOYMENT2-sync *LoadBalancer" "-v;pending" 1 3
 or fail "Deployment did not get ready."
 
 # Deploy secrets separately for sync to pick them up:
@@ -45,11 +45,11 @@ or fail "Could not redeploy secrets for replication auth."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 120
+testArangoDB $ip 2
 or fail "ArangoDB (1) was not reachable."
 
 set ip2 (getLoadBalancerIP "$DEPLOYMENT2-ea")
-testArangoDB $ip2 120
+testArangoDB $ip2 2
 or fail "ArangoDB (2) was not reachable."
 
 set ip3 (getLoadBalancerIP "$DEPLOYMENT-sync")
@@ -68,8 +68,8 @@ kubectl delete -f work3.yaml
 sleep 15
 kubectl delete -f work.yaml
 kubectl delete -f work2.yaml
-waitForKubectl "get pod" $DEPLOYMENT "" 0 120
-waitForKubectl "get pod" $DEPLOYMENT2 "" 0 120
+waitForKubectl "get pod" $DEPLOYMENT "" 0 2
+waitForKubectl "get pod" $DEPLOYMENT2 "" 0 2
 or fail "Could not delete deployment."
 
 output "Ready" ""