diff --git a/test/consumers/OpenAQConsumer.feature b/test/consumers/OpenAQConsumer.feature
index 1179f71..bfee090 100644
--- a/test/consumers/OpenAQConsumer.feature
+++ b/test/consumers/OpenAQConsumer.feature
@@ -24,6 +24,7 @@ Feature: OpenAQ consumer test
     And expect Kafka message with body
     """
     {
+      "locationId": "@assertThat(nullValue())@",
       "location": "@assertThat(notNullValue())@",
       "parameter": "@assertThat(notNullValue())@",
       "date": "@assertThat(notNullValue())@",
@@ -31,7 +32,11 @@ Feature: OpenAQ consumer test
       "unit": "@assertThat(notNullValue())@",
       "coordinates": "@assertThat(notNullValue())@",
       "country": "@assertThat(notNullValue())@",
-      "city": "@assertThat(notNullValue())@"
+      "city": "@assertThat(notNullValue())@",
+      "isMobile": "@assertThat(nullValue())@",
+      "isAnalysis": "@assertThat(nullValue())@",
+      "entity": "@assertThat(nullValue())@",
+      "sensorType": "@assertThat(nullValue())@"
     }
     """
 
diff --git a/test/infra/amq-broker-instance.yaml b/test/infra/amq-broker-instance.yaml
new file mode 100644
index 0000000..bb2a589
--- /dev/null
+++ b/test/infra/amq-broker-instance.yaml
@@ -0,0 +1,23 @@
+apiVersion: broker.amq.io/v1beta1
+kind: ActiveMQArtemis
+metadata:
+  name: broker
+spec:
+  acceptors:
+    - name: artemis_acceptor
+      protocols: 'artemis,core,openwire'
+      port: 61616
+      sslEnabled: false
+    - name: amqp_acceptor
+      protocols: amqp
+      port: 5672
+      sslEnabled: false
+  deploymentPlan:
+    size: 1
+    persistenceEnabled: false
+    requireLogin: false
+    messageMigration: false
+    managementRBACEnabled: true
+    journalType: nio
+    jolokiaAgentEnabled: false
+    image: placeholder
diff --git a/test/scripts/install-amq-broker.sh b/test/scripts/install-amq-broker.sh
index 5527621..e4f5ff5 100755
--- a/test/scripts/install-amq-broker.sh
+++ b/test/scripts/install-amq-broker.sh
@@ -27,8 +27,8 @@ waitFor() {
 }
 
 SOURCE=$(dirname "$0")
-INFRA="${SOURCE}"/../../infra
-ACTIVEMQ_VERSION=v0.19.3
+INFRA="${SOURCE}"/../infra
+ACTIVEMQ_VERSION=v1.0.14
 URL="https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${ACTIVEMQ_VERSION}"
 
 BROKER=$(kubectl get activemqartemis/broker -n ${YAKS_NAMESPACE} || echo "")
@@ -51,7 +51,7 @@ if [ -z "$BROKER" ]; then
   waitFor kubectl wait pod -l name=activemq-artemis-operator --for condition=Ready --timeout=60s -n ${YAKS_NAMESPACE}
 
   # Create AMQ broker
-  kubectl create -f "${INFRA}"/messaging/broker/instances/amq-broker-instance.yaml -n ${YAKS_NAMESPACE}
+  kubectl create -f "${INFRA}"/amq-broker-instance.yaml -n ${YAKS_NAMESPACE}
 
   # wait for broker to start
   waitFor kubectl wait pod -l ActiveMQArtemis=broker --for condition=Ready --timeout=60s -n ${YAKS_NAMESPACE}
diff --git a/test/user-report/UserReportCrime.feature b/test/user-report/UserReportCrime.feature
index fd6d4b8..85e4dbb 100644
--- a/test/user-report/UserReportCrime.feature
+++ b/test/user-report/UserReportCrime.feature
@@ -1,7 +1,7 @@
 Feature: User report and gate-keeper component test
 
   Background:
-    Given URL: http://user-report-system.${YAKS_NAMESPACE}.svc.cluster.local
+    Given URL: http://user-report-system.${YAKS_NAMESPACE}
     Given HTTP request timeout is 60000 ms
     Given load variables application-test.properties
     Given variables
@@ -19,12 +19,14 @@ Feature: User report and gate-keeper component test
     When load Camel K integration UserReportSystem.java with configuration
       | traits | knative-service.min-scale=1 |
     Then Camel K integration user-report-system should be running
+    Then Camel K integration user-report-system should print Listening on
 
   Scenario: Run GateKeeper Camel K integration
     Given Camel K integration property file application-test.properties
     When load Camel K integration GateKeeper.java with configuration
       | traits | knative-service.min-scale=1 |
     Given Camel K integration gate-keeper should be running
+    Then Camel K integration gate-keeper should print Listening on
 
   Scenario: Crime report is send to crime-data topic
     Given variable user is "user1"
diff --git a/test/user-report/UserReportHealth.feature b/test/user-report/UserReportHealth.feature
index 12fa06b..7677870 100644
--- a/test/user-report/UserReportHealth.feature
+++ b/test/user-report/UserReportHealth.feature
@@ -1,7 +1,7 @@
 Feature: Health user report and gate-keeper component test
 
   Background:
-    Given URL: http://user-report-system.${YAKS_NAMESPACE}.svc.cluster.local
+    Given URL: http://user-report-system.${YAKS_NAMESPACE}
     Given HTTP request timeout is 60000 ms
     Given load variables application-test.properties
     Given variables
@@ -19,12 +19,14 @@ Feature: Health user report and gate-keeper component test
     When load Camel K integration UserReportSystem.java with configuration
       | traits | knative-service.min-scale=1 |
     Then Camel K integration user-report-system should be running
+    Then Camel K integration user-report-system should print Listening on
 
   Scenario: Run GateKeeper Camel K integration
     Given Camel K integration property file application-test.properties
     When load Camel K integration GateKeeper.java with configuration
       | traits | knative-service.min-scale=1 |
     Given Camel K integration gate-keeper should be running
+    Then Camel K integration gate-keeper should print Listening on
 
   Scenario: Health report is send to health-data topic
     Given variable user is "user1"