diff --git a/test/actions.github.com/auth-proxy-setup.test.sh b/test/actions.github.com/auth-proxy-setup.test.sh
index 7e5cfce6..34df1524 100755
--- a/test/actions.github.com/auth-proxy-setup.test.sh
+++ b/test/actions.github.com/auth-proxy-setup.test.sh
@@ -55,6 +55,12 @@ function start_squid_proxy() {
         --from-literal=password='actions'
 }
 
+function stop_squid_proxy() {
+    echo "Stopping squid-proxy"
+    docker stop squid
+    docker rm squid
+}
+
 function install_scale_set() {
     echo "Installing scale set ${SCALE_SET_NAMESPACE}/${SCALE_SET_NAME}"
     helm install "${SCALE_SET_NAME}" \
@@ -92,6 +98,7 @@ function main() {
     NAMESPACE="${ARC_NAMESPACE}" log_arc || failed+=("log_arc")
 
     delete_cluster
+    stop_squid_proxy
 
     print_results "${failed[@]}"
 }
diff --git a/test/actions.github.com/init-with-min-runners.test.sh b/test/actions.github.com/init-with-min-runners.test.sh
index b1607e25..763df35e 100755
--- a/test/actions.github.com/init-with-min-runners.test.sh
+++ b/test/actions.github.com/init-with-min-runners.test.sh
@@ -20,7 +20,7 @@ function install_arc() {
     --namespace "arc-systems" \
     --create-namespace \
     --set image.repository="${IMAGE_NAME}" \
-    --set image.tag="${IMAGE_VERSION}" \
+    --set image.tag="${IMAGE_TAG}" \
     --set flags.updateStrategy="eventual" \
     "${ROOT_DIR}/charts/gha-runner-scale-set-controller" \
     --debug
@@ -33,8 +33,8 @@ function install_arc() {
 
 function install_scale_set() {
     echo "Installing scale set ${SCALE_SET_NAMESPACE}/${SCALE_SET_NAME}"
-    helm install "$ARC_NAME" \
-    --namespace "arc-runners" \
+    helm install "${SCALE_SET_NAME}" \
+    --namespace "${SCALE_SET_NAMESPACE}" \
     --create-namespace \
     --set githubConfigUrl="https://github.com/${TARGET_ORG}/${TARGET_REPO}" \
     --set githubConfigSecret.github_token="${GITHUB_TOKEN}" \
@@ -52,7 +52,7 @@ function assert_5_runners() {
     echo "[*] Asserting 5 runners are created"
     local count=0
     while true; do
-        pod_count=$(kubectl get runners -n "${SCALE_SET_NAMESPACE}" --selector="gha-runner-scale-set=${SCALE_SET_NAME}" --no-headers | wc -l)
+        pod_count=$(kubectl get pods -n arc-runners --no-headers | wc -l)
 
         if [[ "${pod_count}" = 5 ]]; then
             echo "[*] Found 5 runners as expected"
diff --git a/test/actions.github.com/kubernetes-mode-setup.test.sh b/test/actions.github.com/kubernetes-mode-setup.test.sh
index 59c8a653..e09203c7 100755
--- a/test/actions.github.com/kubernetes-mode-setup.test.sh
+++ b/test/actions.github.com/kubernetes-mode-setup.test.sh
@@ -46,11 +46,10 @@ function install_scale_set() {
         --set githubConfigUrl="https://github.com/${TARGET_ORG}/${TARGET_REPO}" \
         --set githubConfigSecret.github_token="${GITHUB_TOKEN}" \
         --set containerMode.type="kubernetes" \
-        --set containerMode.kubernetesModeWorkVolumeClaim.accessModes="{\"ReadWriteOnce\"}" \
+        --set containerMode.kubernetesModeWorkVolumeClaim.accessModes={"ReadWriteOnce"} \
         --set containerMode.kubernetesModeWorkVolumeClaim.storageClassName="openebs-hostpath" \
         --set containerMode.kubernetesModeWorkVolumeClaim.resources.requests.storage="1Gi" \
         "${ROOT_DIR}/charts/gha-runner-scale-set" \
-        --version="${VERSION}" \
         --debug
 
     if ! NAME="${SCALE_SET_NAME}" NAMESPACE="${ARC_NAMESPACE}" wait_for_scale_set; then
diff --git a/test/actions.github.com/update-strategy.test.sh b/test/actions.github.com/update-strategy.test.sh
index 927cee56..3aed70f9 100755
--- a/test/actions.github.com/update-strategy.test.sh
+++ b/test/actions.github.com/update-strategy.test.sh
@@ -133,7 +133,7 @@ function main() {
 
     INSTALLATION_NAME="${SCALE_SET_NAME}" NAMESPACE="${SCALE_SET_NAMESPACE}" cleanup_scale_set || failed+=("cleanup_scale_set")
 
-    NAMESPACE="${ARC_NAMESPACE}" arc_logs
+    NAMESPACE="${ARC_NAMESPACE}" log_arc || failed+=("log_arc")
 
     delete_cluster