diff --git a/src/security/core/tests/authentication.c b/src/security/core/tests/authentication.c
index 2d13079..afab49b 100644
--- a/src/security/core/tests/authentication.c
+++ b/src/security/core/tests/authentication.c
@@ -42,7 +42,6 @@ static const char *config =
     "    <ExternalDomainId>0</ExternalDomainId>"
     "    <Tag>\\${CYCLONEDDS_PID}</Tag>"
     "  </Discovery>"
-    "  <Tracing><Verbosity>config</></>"
     "  <DDSSecurity>"
     "    <Authentication>"
     "      <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
diff --git a/src/security/core/tests/config.c b/src/security/core/tests/config.c
index 6bfc918..6cb404d 100644
--- a/src/security/core/tests/config.c
+++ b/src/security/core/tests/config.c
@@ -50,6 +50,15 @@
                    "file:Permissions_CA.pem", "file:Governance.p7s", "file:Permissions.p7s", \
                    pre_str, post_str, binprops)
 
+static const char *default_config =
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "</Domain>";
+
+
 /*
  * The 'found' variable will contain flags related to the expected log
  * messages that were received.
@@ -96,8 +105,17 @@ CU_Test(ddssec_config, empty, .init = ddsrt_init, .fini = ddsrt_fini)
     NULL
   };
 
+  const char *sec_config =
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>config</></>"
+    "  <DDSSecurity />"
+    "</Domain>";
+
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<DDSSecurity/>");
+  domain = dds_create_domain(0, sec_config);
   CU_ASSERT_EQUAL_FATAL(domain, DDS_RETCODE_ERROR);
   reset_logger();
 
@@ -116,7 +134,7 @@ CU_Test(ddssec_config, non, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   dds_delete(domain);
   reset_logger();
@@ -139,6 +157,9 @@ CU_Test(ddssec_config, missing, .init = ddsrt_init, .fini = ddsrt_fini)
   /* IdentityCertificate, IdentityCA and PrivateKey values or elements are missing. */
   const char *sec_config =
     "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
     "  <Tracing><Verbosity>finest</></>"
     "  <DDSSecurity>"
     "    <Authentication>"
@@ -190,30 +211,31 @@ CU_Test(ddssec_config, all, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   const char *sec_config =
-    "<"DDS_PROJECT_NAME">"
-    "  <Domain id=\"any\">"
-    "    <Tracing><Verbosity>finest</></>"
-    "    <DDSSecurity>"
-    "      <Authentication>"
-    "        <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
-    "        <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
-    "        <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
-    "        <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
-    "        <Password>testtext_Password_testtext</Password>"
-    "        <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
-    "      </Authentication>"
-    "      <Cryptographic>"
-    "        <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
-    "      </Cryptographic>"
-    "      <AccessControl>"
-    "        <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-    "        <Governance>file:Governance.p7s</Governance>"
-    "        <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-    "        <Permissions>file:Permissions.p7s</Permissions>"
-    "      </AccessControl>"
-    "    </DDSSecurity>"
-    "  </Domain>"
-    "</"DDS_PROJECT_NAME">";
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "  <DDSSecurity>"
+    "    <Authentication>"
+    "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
+    "      <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
+    "      <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
+    "      <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
+    "      <Password>testtext_Password_testtext</Password>"
+    "      <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
+    "    </Authentication>"
+    "    <Cryptographic>"
+    "      <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
+    "    </Cryptographic>"
+    "    <AccessControl>"
+    "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
+    "      <Governance>file:Governance.p7s</Governance>"
+    "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
+    "      <Permissions>file:Permissions.p7s</Permissions>"
+    "    </AccessControl>"
+    "  </DDSSecurity>"
+    "</Domain>";
 
   set_logger_exp(log_expected);
   domain = dds_create_domain(0, sec_config);
@@ -261,6 +283,10 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
 
   const char *sec_config =
     "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
     "  <DDSSecurity>"
     "    <Authentication>"
     "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -278,7 +304,6 @@ CU_Test(ddssec_config, security, .init = ddsrt_init, .fini = ddsrt_fini)
     "      <Permissions>file:Permissions.p7s</Permissions>"
     "    </AccessControl>"
     "  </DDSSecurity>"
-    "  <Tracing><Verbosity>finest</></>"
     "</Domain>";
 
   set_logger_exp(log_expected);
@@ -325,30 +350,31 @@ CU_Test(ddssec_config, deprecated, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   const char *sec_config =
-    "<"DDS_PROJECT_NAME">"
-    "  <Domain id=\"any\">"
-    "    <DDSSecurity>"
-    "      <Authentication>"
-    "        <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
-    "        <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
-    "        <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
-    "        <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
-    "        <Password>testtext_Password_testtext</Password>"
-    "        <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
-    "      </Authentication>"
-    "      <Cryptographic>"
-    "        <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
-    "      </Cryptographic>"
-    "      <AccessControl>"
-    "        <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-    "        <Governance>file:Governance.p7s</Governance>"
-    "        <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-    "        <Permissions>file:Permissions.p7s</Permissions>"
-    "      </AccessControl>"
-    "    </DDSSecurity>"
-    "    <Tracing><Verbosity>finest</></>"
-    "  </Domain>"
-    "</"DDS_PROJECT_NAME">";
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "  <DDSSecurity>"
+    "    <Authentication>"
+    "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
+    "      <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
+    "      <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
+    "      <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
+    "      <Password>testtext_Password_testtext</Password>"
+    "      <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
+    "    </Authentication>"
+    "    <Cryptographic>"
+    "      <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
+    "    </Cryptographic>"
+    "    <AccessControl>"
+    "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
+    "      <Governance>file:Governance.p7s</Governance>"
+    "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
+    "      <Permissions>file:Permissions.p7s</Permissions>"
+    "    </AccessControl>"
+    "  </DDSSecurity>"
+    "</Domain>";
 
   set_logger_exp(log_expected);
   domain = dds_create_domain(0, sec_config);
@@ -395,7 +421,7 @@ CU_Test(ddssec_config, qos, .init = ddsrt_init, .fini = ddsrt_fini)
   dds_qset_prop(qos, "dds.sec.auth.trusted_ca_dir", "file:/test/dir");
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(0, qos, NULL);
   CU_ASSERT_FATAL(participant > 0);
@@ -445,7 +471,7 @@ CU_Test(ddssec_config, qos_props, .init = ddsrt_init, .fini = ddsrt_fini)
   dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(0, qos, NULL);
   CU_ASSERT_FATAL(participant > 0);
@@ -475,19 +501,24 @@ CU_Test(ddssec_config, config_qos, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   const char *sec_config =
-    "<Tracing><Verbosity>finest</></>"
-    "<DDSSecurity>"
-    "  <Authentication>"
-    "    <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
-    "    <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
-    "    <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
-    "  </Authentication>"
-    "  <AccessControl>"
-    "    <Governance>file:Governance.p7s</Governance>"
-    "    <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-    "    <Permissions>file:Permissions.p7s</Permissions>"
-    "  </AccessControl>"
-    "</DDSSecurity>";
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "  <DDSSecurity>"
+    "    <Authentication>"
+    "      <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
+    "      <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
+    "      <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
+    "    </Authentication>"
+    "    <AccessControl>"
+    "      <Governance>file:Governance.p7s</Governance>"
+    "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
+    "      <Permissions>file:Permissions.p7s</Permissions>"
+    "    </AccessControl>"
+    "  </DDSSecurity>"
+    "</Domain>";
 
   CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_LIBRARY_PATH, WRAPPERLIB_PATH("dds_security_authentication_wrapper"));
@@ -533,26 +564,31 @@ CU_Test(ddssec_config, other_prop, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   const char *sec_config =
-    "<Tracing><Verbosity>finest</></>"
-    "<DDSSecurity>"
-    "  <Authentication>"
-    "    <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
-    "    <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
-    "    <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
-    "    <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
-    "    <Password>testtext_Password_testtext</Password>"
-    "    <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
-    "  </Authentication>"
-    "  <Cryptographic>"
-    "    <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
-    "  </Cryptographic>"
-    "  <AccessControl>"
-    "    <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-    "    <Governance>file:Governance.p7s</Governance>"
-    "    <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-    "    <Permissions>file:Permissions.p7s</Permissions>"
-    "  </AccessControl>"
-    "</DDSSecurity>";
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "  <DDSSecurity>"
+    "    <Authentication>"
+    "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
+    "      <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
+    "      <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
+    "      <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
+    "      <Password>testtext_Password_testtext</Password>"
+    "      <TrustedCADirectory>testtext_Dir_testtext</TrustedCADirectory>"
+    "    </Authentication>"
+    "    <Cryptographic>"
+    "      <Library initFunction=\"init_test_cryptography_all_ok\" finalizeFunction=\"finalize_test_cryptography_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_cryptography_wrapper") "\"/>"
+    "    </Cryptographic>"
+    "    <AccessControl>"
+    "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
+    "      <Governance>file:Governance.p7s</Governance>"
+    "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
+    "      <Permissions>file:Permissions.p7s</Permissions>"
+    "    </AccessControl>"
+    "  </DDSSecurity>"
+    "</Domain>";
 
   CU_ASSERT_FATAL((qos = dds_create_qos()) != NULL);
   dds_qset_prop(qos, "test.dds.sec.prop1", "testtext_value1_testtext");
@@ -598,19 +634,24 @@ CU_Test(ddssec_config, qos_invalid, .init = ddsrt_init, .fini = ddsrt_fini)
   };
 
   const char *sec_config =
-    "<Tracing><Verbosity>finest</></>"
-    "<DDSSecurity>"
-    "  <Authentication>"
-    "    <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
-    "    <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
-    "    <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
-    "  </Authentication>"
-    "  <AccessControl>"
-    "    <Governance>file:Governance.p7s</Governance>"
-    "    <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-    "    <Permissions>file:Permissions.p7s</Permissions>"
-    "  </AccessControl>"
-    "</DDSSecurity>";
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "  <DDSSecurity>"
+    "    <Authentication>"
+    "      <IdentityCertificate>"TEST_IDENTITY_CERTIFICATE_DUMMY"</IdentityCertificate>"
+    "      <IdentityCA>"TEST_IDENTITY_CA_CERTIFICATE_DUMMY"</IdentityCA>"
+    "      <PrivateKey>"TEST_IDENTITY_PRIVATE_KEY_DUMMY"</PrivateKey>"
+    "    </Authentication>"
+    "    <AccessControl>"
+    "      <Governance>file:Governance.p7s</Governance>"
+    "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
+    "      <Permissions>file:Permissions.p7s</Permissions>"
+    "    </AccessControl>"
+    "  </DDSSecurity>"
+    "</Domain>";
 
   set_logger_exp(log_expected);
 
diff --git a/src/security/core/tests/handshake.c b/src/security/core/tests/handshake.c
index 0408bb9..5534434 100644
--- a/src/security/core/tests/handshake.c
+++ b/src/security/core/tests/handshake.c
@@ -40,7 +40,6 @@ static const char *config =
     "    <ExternalDomainId>0</ExternalDomainId>"
     "    <Tag>\\${CYCLONEDDS_PID}</Tag>"
     "  </Discovery>"
-    "  <Tracing><Verbosity>config</></>"
     "  <DDSSecurity>"
     "    <Authentication>"
     "      <Library finalizeFunction=\"finalize_test_authentication_wrapped\" initFunction=\"init_test_authentication_wrapped\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
diff --git a/src/security/core/tests/plugin_loading.c b/src/security/core/tests/plugin_loading.c
index f6aa141..8e09cc5 100644
--- a/src/security/core/tests/plugin_loading.c
+++ b/src/security/core/tests/plugin_loading.c
@@ -24,6 +24,14 @@
 
 static uint32_t found;
 
+static const char *default_config =
+    "<Domain id=\"any\">"
+    "  <Discovery>"
+    "    <Tag>${CYCLONEDDS_PID}</Tag>"
+    "  </Discovery>"
+    "  <Tracing><Verbosity>finest</></>"
+    "</Domain>";
+
 static void logger(void *ptr, const dds_log_data_t *data)
 {
   char **expected = (char **)ptr;
@@ -60,6 +68,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
 
   const char *sec_config =
       "<Domain id=\"any\">"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
       "  <Tracing><Verbosity>finest</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
@@ -75,9 +86,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok, .init = ddsrt_init, .fini = ddsr
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -104,7 +115,10 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_NON_EXISTING_FUNC\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -119,9 +133,9 @@ CU_Test(ddssec_security_plugin_loading, missing_finalize, .init = ddsrt_init, .f
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -147,7 +161,10 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_missing_func\" finalizeFunction=\"finalize_test_authentication_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -162,9 +179,9 @@ CU_Test(ddssec_security_plugin_loading, authentication_missing_function, .init =
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -190,7 +207,10 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -205,9 +225,9 @@ CU_Test(ddssec_security_plugin_loading, access_control_missing_function, .init =
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_missing_func\" finalizeFunction=\"finalize_test_access_control_missing_func\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -233,7 +253,10 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -248,9 +271,9 @@ CU_Test(ddssec_security_plugin_loading, cryptography_missing_function, .init = d
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -279,7 +302,10 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper_INVALID") "\"/>"
@@ -294,9 +320,9 @@ CU_Test(ddssec_security_plugin_loading, no_library_in_path, .init = ddsrt_init,
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -323,7 +349,10 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
 
   const char *sec_config =
       "<Domain id=\"any\">"
-      "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
+      "  <Tracing><Verbosity>warning</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_init_error\" finalizeFunction=\"finalize_test_authentication_init_error\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -338,9 +367,9 @@ CU_Test(ddssec_security_plugin_loading, init_error, .init = ddsrt_init, .fini =
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -370,9 +399,9 @@ CU_Test(ddssec_security_plugin_loading, all_ok_with_props, .init = ddsrt_init, .
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
 
@@ -391,7 +420,7 @@ CU_Test(ddssec_security_plugin_loading, all_ok_with_props, .init = ddsrt_init, .
   dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(0, qos, NULL);
   CU_ASSERT_FATAL(participant > 0);
@@ -418,9 +447,9 @@ CU_Test(ddssec_security_plugin_loading, missing_plugin_property_with_props, .ini
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
 
@@ -439,7 +468,7 @@ CU_Test(ddssec_security_plugin_loading, missing_plugin_property_with_props, .ini
   dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(0, qos, NULL);
   CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@@ -466,8 +495,8 @@ CU_Test(ddssec_security_plugin_loading, empty_plugin_property_with_props, .init
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
 
@@ -486,7 +515,7 @@ CU_Test(ddssec_security_plugin_loading, empty_plugin_property_with_props, .init
   dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
   CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@@ -512,10 +541,9 @@ CU_Test(ddssec_security_plugin_loading, missing_security_property_with_props, .i
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s");
-  /* we ignore permissions for testing
-  //dds_qset_prop (qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s"); */
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
+  //dds_qset_prop (qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");
 
@@ -534,7 +562,7 @@ CU_Test(ddssec_security_plugin_loading, missing_security_property_with_props, .i
   dds_qset_bprop(qos, "test.bprop1", bvalue, 3);
 
   set_logger_exp(log_expected);
-  domain = dds_create_domain(0, "<Tracing><Verbosity>finest</></>");
+  domain = dds_create_domain(0, default_config);
   CU_ASSERT_FATAL(domain > 0);
   participant = dds_create_participant(DDS_DOMAIN_DEFAULT, qos, NULL);
   CU_ASSERT_EQUAL_FATAL(participant, DDS_RETCODE_ERROR);
@@ -558,6 +586,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
 
   const char *sec_config =
       "<Domain id=\"1\">"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
       "  <Tracing><Verbosity>finest</></>"
       "  <DDSSecurity>"
       "    <Authentication>"
@@ -573,14 +604,17 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>"
       "<Domain id=\"2\">"
       "  <Tracing><Verbosity>finest</></>"
+      "  <Discovery>"
+      "    <Tag>${CYCLONEDDS_PID}</Tag>"
+      "  </Discovery>"
       "  <DDSSecurity>"
       "    <Authentication>"
       "      <Library initFunction=\"init_test_authentication_all_ok\" finalizeFunction=\"finalize_test_authentication_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_authentication_wrapper") "\"/>"
@@ -595,9 +629,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
       "    </Cryptographic>"
       "    <AccessControl>"
       "      <Library initFunction=\"init_test_access_control_all_ok\" finalizeFunction=\"finalize_test_access_control_all_ok\" path=\"" WRAPPERLIB_PATH("dds_security_access_control_wrapper") "\"/>"
-      "      <Governance>file:Governance.p7s</Governance>"
-      "      <PermissionsCA>file:Permissions_CA.pem</PermissionsCA>"
-      "      <Permissions>file:Permissions.p7s</Permissions>"
+      "      <Governance></Governance>"
+      "      <PermissionsCA></PermissionsCA>"
+      "      <Permissions></Permissions>"
       "    </AccessControl>"
       "  </DDSSecurity>"
       "</Domain>";
@@ -614,9 +648,9 @@ CU_Test(ddssec_security_plugin_loading, multiple_domains_different_config, .init
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CA, "testtext_IdentityCA_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PRIV_KEY, "testtext_PrivateKey_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_IDENTITY_CERT, "testtext_IdentityCertificate_testtext");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:Permissions_CA.pem");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:Governance.p7s");
-  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:Permissions.p7s");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS_CA, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_GOVERNANCE, "file:");
+  dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_PERMISSIONS, "file:");
   dds_qset_prop(qos, DDS_SEC_PROP_AUTH_PASSWORD, "testtext_Password_testtext");
   dds_qset_prop(qos, DDS_SEC_PROP_ACCESS_TRUSTED_CA_DIR, "file:/test/dir");