diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
index 3ce13574dfe16572731fda07303885ff5e097377..b3c8d3568ecc0727fa4710aff6ad80f583e70600 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
@@ -117,7 +117,7 @@ public class CommonPolicyServiceImpl {
     }
 
     public void applyActionServiceBasedOnKpiId(String kpiId) {
-        if (!kpiPolicyRuleServiceMap.contains(kpiId)) {
+        if (!kpiPolicyRuleServiceMap.containsKey(kpiId)) {
             LOGGER.info("No Policy for KpiId");
             return;
         }
diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index e6bf8d1e1e2c48c884b70c04b51b5ea45dc2278a..d0fca91427e5d0242db5abcd349ea1cdf9bb5364 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -72,6 +72,14 @@ quarkus:
         cpu: 500m
         memory: 2048Mi
 
+#Disable Kafka on Test
+"%test":
+  mp:
+    messaging:
+      connector:
+        smallrye-kafka:
+          enabled: false
+
 mp:
   messaging:
     incoming: