diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
index 9207f373b..7d174c474 100644
--- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
+++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocal.cpp
@@ -112,9 +112,9 @@ DdsRouterConfiguration dds_test_simple_configuration(
  * to Late Joiners.
  */
 #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-    template <class MsgStruct>
+template <class MsgStruct>
 #else
-    template <class MsgStruct, class MsgStructType>
+template <class MsgStruct, class MsgStructType>
 #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 void test_local_communication(
         DdsRouterConfiguration ddsrouter_configuration,
@@ -136,7 +136,7 @@ void test_local_communication(
     MsgStruct msg;
 
     #if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
-        MsgStructType type;
+    MsgStructType type;
     #endif // if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
 
     std::string msg_str;
@@ -150,18 +150,18 @@ void test_local_communication(
 
     // Create DDS Publisher in domain 0
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        TestPublisher<MsgStruct> publisher(msg.isKeyDefined());
+    TestPublisher<MsgStruct> publisher(msg.isKeyDefined());
     #else
-        TestPublisher<MsgStruct> publisher(type.m_isGetKeyDefined);
+    TestPublisher<MsgStruct> publisher(type.m_isGetKeyDefined);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 
     ASSERT_TRUE(publisher.init(0));
 
     // Create DDS Subscriber in domain 1
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        TestSubscriber<MsgStruct> subscriber(msg.isKeyDefined(), transient_local);
+    TestSubscriber<MsgStruct> subscriber(msg.isKeyDefined(), transient_local);
     #else
-        TestSubscriber<MsgStruct> subscriber(type.m_isGetKeyDefined, transient_local);
+    TestSubscriber<MsgStruct> subscriber(type.m_isGetKeyDefined, transient_local);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 
     ASSERT_TRUE(subscriber.init(1, &msg, &samples_received));
@@ -227,11 +227,11 @@ void test_local_communication(
 TEST(DDSTestLocal, end_to_end_local_communication)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration());
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration());
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration());
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration());
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 
 }
@@ -243,11 +243,11 @@ TEST(DDSTestLocal, end_to_end_local_communication)
 TEST(DDSTestLocal, end_to_end_local_communication_keyed)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorldKeyed>(
-            test::dds_test_simple_configuration());
+    test::test_local_communication<HelloWorldKeyed>(
+        test::dds_test_simple_configuration());
     #else
-        test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
-            test::dds_test_simple_configuration());
+    test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
+        test::dds_test_simple_configuration());
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -259,22 +259,22 @@ TEST(DDSTestLocal, end_to_end_local_communication_keyed)
 TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(true));
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(true));
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(true));
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(true));
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
 TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery_keyed)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorldKeyed>(
-            test::dds_test_simple_configuration(true));
+    test::test_local_communication<HelloWorldKeyed>(
+        test::dds_test_simple_configuration(true));
     #else
-        test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
-            test::dds_test_simple_configuration(true));
+    test::test_local_communication<HelloWorldKeyed, HelloWorldKeyedPubSubType>(
+        test::dds_test_simple_configuration(true));
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -288,15 +288,15 @@ TEST(DDSTestLocal, end_to_end_local_communication_disable_dynamic_discovery_keye
 TEST(DDSTestLocal, end_to_end_local_communication_high_frequency)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(),
-            1000,   // wait for 1000 samples received
-            0);     // send it without waiting from one sample to the other
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(),
+        1000,       // wait for 1000 samples received
+        0);         // send it without waiting from one sample to the other
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(),
-            1000,   // wait for 1000 samples received
-            0);     // send it without waiting from one sample to the other
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(),
+        1000,       // wait for 1000 samples received
+        0);         // send it without waiting from one sample to the other
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -310,17 +310,17 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_frequency)
 TEST(DDSTestLocal, end_to_end_local_communication_high_size)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            10000); // 500K message size
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        10000);     // 500K message size
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            10000); // 500K message size
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        10000);     // 500K message size
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -336,17 +336,17 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_size)
 TEST(DDSTestLocal, end_to_end_local_communication_high_throughput)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(),
-            500,
-            1,
-            1000); // 50K message size
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(),
+        500,
+        1,
+        1000);     // 50K message size
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(),
-            500,
-            1,
-            1000); // 50K message size
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(),
+        500,
+        1,
+        1000);     // 50K message size
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -357,19 +357,19 @@ TEST(DDSTestLocal, end_to_end_local_communication_high_throughput)
 TEST(DDSTestLocal, end_to_end_local_communication_transient_local)
 {
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            test::DEFAULT_MESSAGE_SIZE,
-            true);
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        test::DEFAULT_MESSAGE_SIZE,
+        true);
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            test::DEFAULT_MESSAGE_SIZE,
-            true);
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        test::DEFAULT_MESSAGE_SIZE,
+        true);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
@@ -380,19 +380,19 @@ TEST(DDSTestLocal, end_to_end_local_communication_transient_local)
 TEST(DDSTestLocal, end_to_end_local_communication_transient_local_disable_dynamic_discovery)
 {
         #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        test::test_local_communication<HelloWorld>(
-            test::dds_test_simple_configuration(true, true),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            test::DEFAULT_MESSAGE_SIZE,
-            true);
+    test::test_local_communication<HelloWorld>(
+        test::dds_test_simple_configuration(true, true),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        test::DEFAULT_MESSAGE_SIZE,
+        true);
     #else
-        test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
-            test::dds_test_simple_configuration(true, true),
-            test::DEFAULT_SAMPLES_TO_RECEIVE,
-            test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
-            test::DEFAULT_MESSAGE_SIZE,
-            true);
+    test::test_local_communication<HelloWorld, HelloWorldPubSubType>(
+        test::dds_test_simple_configuration(true, true),
+        test::DEFAULT_SAMPLES_TO_RECEIVE,
+        test::DEFAULT_MILLISECONDS_PUBLISH_LOOP,
+        test::DEFAULT_MESSAGE_SIZE,
+        true);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 }
 
diff --git a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
index 4402cf200..ee602969c 100644
--- a/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
+++ b/ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalDisposeKey.cpp
@@ -100,7 +100,7 @@ void test_local_communication_key_dispose(
     HelloWorldKeyed msg;
 
     #if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
-        HelloWorldKeyedPubSubType type;
+    HelloWorldKeyedPubSubType type;
     #endif // if FASTRTPS_VERSION_MAJOR >= 2 && FASTRTPS_VERSION_MINOR >= 13
 
     std::string msg_str;
@@ -115,18 +115,18 @@ void test_local_communication_key_dispose(
 
     // Create DDS Publisher in domain 0
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        TestPublisher<HelloWorldKeyed> publisher(msg.isKeyDefined());
+    TestPublisher<HelloWorldKeyed> publisher(msg.isKeyDefined());
     #else
-        TestPublisher<HelloWorldKeyed> publisher(type.m_isGetKeyDefined);
+    TestPublisher<HelloWorldKeyed> publisher(type.m_isGetKeyDefined);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 
     ASSERT_TRUE(publisher.init(0));
 
     // Create DDS Subscriber in domain 1
     #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
-        TestSubscriber<HelloWorldKeyed> subscriber(msg.isKeyDefined());
+    TestSubscriber<HelloWorldKeyed> subscriber(msg.isKeyDefined());
     #else
-        TestSubscriber<HelloWorldKeyed> subscriber(type.m_isGetKeyDefined);
+    TestSubscriber<HelloWorldKeyed> subscriber(type.m_isGetKeyDefined);
     #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13
 
     ASSERT_TRUE(subscriber.init(1, &msg, &samples_received));