diff --git a/templates/tests/httpbin.yaml b/templates/tests/httpbin.yaml
index d110429..bf07429 100644
--- a/templates/tests/httpbin.yaml
+++ b/templates/tests/httpbin.yaml
@@ -13,10 +13,12 @@ spec:
         - -c
         - |
           set -e
-          curl -X GET "http://{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.svc:8000/headers"
-          curl -X GET "http://{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.svc:8000/response-headers?freeform=should-be-in-hawk-service"
+          PARAM="should-be-in-hawk-service-${RANDOM}"
+          curl -X GET "http://{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.{{ include "hawk-envoy-plugin.fullname" . }}-httpbin.svc:8000/response-headers?freeform=${PARAM}"
           
           sleep 10
           
-          curl -X GET "{{ .Values.hawkEnvoyPlugin.hawkServiceApiUrl }}/endpoints/unmapped"
+          echo "Checking if ${PARAM} is in unmapped endpoints:"
+
+          curl -X GET "{{ .Values.hawkEnvoyPlugin.hawkServiceApiUrl }}/endpoints/unmapped" | grep "${PARAM}"
   restartPolicy: Never
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index 22acced..29aa255 100644
--- a/values.yaml
+++ b/values.yaml
@@ -27,7 +27,7 @@ collector:
     repository: ghcr.io/privacyengineering/collector-go
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "main"
 
   service:
     type: ClusterIP
@@ -74,7 +74,7 @@ consumer:
     repository: ghcr.io/privacyengineering/consumer
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "main"
 
   service:
     type: ClusterIP