diff --git a/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml b/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml
index bd13f9f18e9d11ad35ccc041c1cc02f6224107da..8d814ea3d51f680c11289b54f08cd0b5b2629948 100644
--- a/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml
@@ -12,7 +12,8 @@ data:
       'invoker_col': 'invokerdetails',
       'prov_col': 'providerenrolmentdetails',
       'serv_col': 'serviceapidescriptions',
-      'capif_users_col': "user",
+      'capif_users_col': 'user',
+      'certs_col': 'certs',
       'host': 'mongo',
       'port': "27017"
     }
diff --git a/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml b/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml
index 4d83c986d75cee2cc228f2b34bae07ee8b95cfb7..f06888931bded3d1d59114a05b1877f9283db25d 100644
--- a/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml
@@ -9,8 +9,8 @@ data:
       'password': '{{ .Values.env.mongoInitdbRootPassword }}',
       'db': 'capif',
       'col': 'invokerdetails',
-      'capif_users_col': "user",
-      'certs_col': "certs",
+      'capif_users_col': 'user',
+      'certs_col': 'certs',
       'service_col': 'serviceapidescriptions',
       'host': 'mongo',
       'port': "27017"
diff --git a/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml b/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml
index e59cfe179aa1e2cd88444e2785371a5b398a40de..6da59dd82a3b4cded19ec9fe77cd88d85db7556a 100644
--- a/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml
@@ -9,7 +9,7 @@ data:
       'password': '{{ .Values.env.mongoInitdbRootPassword }}',
       'db': 'capif',
       'col': 'providerenrolmentdetails',
-      'certs_col': "certs",
+      'certs_col': 'certs',
       'capif_users': 'user',
       'host': 'mongo',
       'port': "27017"
diff --git a/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml b/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml
index 729d751f3656155cb05d6b3b4ea28b80c350cb97..b06b6d15d8332aa52d548cd6314ee37730ae5685 100644
--- a/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml
@@ -9,7 +9,8 @@ data:
       'password': '{{ .Values.env.mongoInitdbRootPassword }}',
       'db': 'capif',
       'logs_col': 'invocationlogs',
-      'capif_users_col': "user",
+      'capif_users_col': 'user',
+      'certs_col': 'certs',
       'host': 'mongo',
       'port': "27017"
     }
diff --git a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml
index 96d0c367f3380331806c9c040a985cf22f9b4b27..1e217915e80fe4992e8249e00574d372d12a6237 100644
--- a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml
@@ -10,7 +10,8 @@ data:
       'db': 'capif',
       'col': 'serviceapidescriptions',
       'invokers_col': 'invokerdetails',
-      'capif_users_col': "user",
+      'capif_users_col': 'user',
+      'certs_col': 'certs',
       'host': 'mongo',
       'port': "27017"
     }
diff --git a/helm/capif/charts/ocf-events/templates/configmap.yaml b/helm/capif/charts/ocf-events/templates/configmap.yaml
index e599fef3644c0e2eda22e3776defc86473a35009..92697a2c40b1f3aa81a23d6fd745f0d15ea21110 100644
--- a/helm/capif/charts/ocf-events/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-events/templates/configmap.yaml
@@ -9,7 +9,7 @@ data:
       'password': '{{ .Values.env.mongoInitdbRootPassword }}',
       'db': 'capif',
       'col': 'eventsdetails',
-      'certs_col': "certs",
+      'certs_col': 'certs',
       'capif_invokers_col': 'invokerdetails',
       'capif_providers_col': 'providerenrolmentdetails',
       'capif_acls_col': 'acls',
diff --git a/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml b/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml
index a76b2f2bbe1772205d1707635efb3df3209eeb8e..651ad05b2791bebd2a0a3f4f31c2725b80f24e28 100644
--- a/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml
@@ -9,8 +9,8 @@ data:
       'password': '{{ .Values.env.mongoInitdbRootPassword }}',
       'db': 'capif',
       'col': 'serviceapidescriptions',
-      'certs_col': "certs",
-      'capif_provider_col': "providerenrolmentdetails",
+      'certs_col': 'certs',
+      'capif_provider_col': 'providerenrolmentdetails',
       'host': 'mongo',
       'port': "27017"
     }
diff --git a/helm/capif/charts/ocf-security/templates/configmap.yaml b/helm/capif/charts/ocf-security/templates/configmap.yaml
index 5d099d194854f2bc3a63fa1c83e075c4b3edff36..19e0c99b14145ef518ea1a307789a55a8f93dffd 100644
--- a/helm/capif/charts/ocf-security/templates/configmap.yaml
+++ b/helm/capif/charts/ocf-security/templates/configmap.yaml
@@ -10,7 +10,7 @@ data:
       'db': 'capif',
       'col': 'security',
       'capif_service_col': 'serviceapidescriptions',
-      'certs_col': "certs",
+      'certs_col': 'certs',
       'capif_invokers' : 'invokerdetails',
       'host': 'mongo',
       'port': "27017"
diff --git a/tests/features/Event Req/__init__.robot b/tests/features/Event Req/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..2b28f2062f897e7403d0a4dc7e6f1a3408bb4776
--- /dev/null
+++ b/tests/features/Event Req/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    event_filter
\ No newline at end of file
diff --git a/tests/features/Event Filter/event_req.robot b/tests/features/Event Req/event_req.robot
similarity index 99%
rename from tests/features/Event Filter/event_req.robot
rename to tests/features/Event Req/event_req.robot
index caddaf9ffb1004442624f913da2e0ab8cd2ee449..26b1b635fbc56f52015337e9f79ff74ad83f2807 100644
--- a/tests/features/Event Filter/event_req.robot	
+++ b/tests/features/Event Req/event_req.robot	
@@ -20,7 +20,7 @@ ${SUBSCRIPTION_ID_NOT_VALID}        not-valid
 
 *** Test Cases ***
 Invoker subscribe to Service API Available
-    [Tags]    pelayo-1    mockserver
+    [Tags]    event_req-1    mockserver
 
     # Initialize Mock server
     Init Mock Server