diff --git a/Tests/unit/IPTestAdministrator.h b/Tests/unit/IPTestAdministrator.h
index 270442e23a..ef749723fc 100644
--- a/Tests/unit/IPTestAdministrator.h
+++ b/Tests/unit/IPTestAdministrator.h
@@ -19,12 +19,10 @@
 
 #pragma once
 
-#define MODULE_NAME ThunderUnitTests
-
 #include <string>
 #include <time.h>
 
-class IPTestAdministrator;
+#include "Module.h"
 
 class IPTestAdministrator
 {
diff --git a/Tests/unit/Module.h b/Tests/unit/Module.h
new file mode 100644
index 0000000000..cb547a8ea8
--- /dev/null
+++ b/Tests/unit/Module.h
@@ -0,0 +1,24 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2020 Metrological
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#ifndef MODULE_NAME
+#define MODULE_NAME ThunderUnitTests
+#endif
diff --git a/Tests/unit/core/test_cyclicbuffer.cpp b/Tests/unit/core/test_cyclicbuffer.cpp
index 33ba8c42e7..91f16ca5f1 100644
--- a/Tests/unit/core/test_cyclicbuffer.cpp
+++ b/Tests/unit/core/test_cyclicbuffer.cpp
@@ -17,13 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
-#include <condition_variable>
-#include <mutex>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Core {
diff --git a/Tests/unit/core/test_databuffer.cpp b/Tests/unit/core/test_databuffer.cpp
index 01542ecbfc..cf8daf9990 100644
--- a/Tests/unit/core/test_databuffer.cpp
+++ b/Tests/unit/core/test_databuffer.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_dataelement.cpp b/Tests/unit/core/test_dataelement.cpp
index 88dc1c5d97..3585277391 100644
--- a/Tests/unit/core/test_dataelement.cpp
+++ b/Tests/unit/core/test_dataelement.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/DataElement.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_dataelementfile.cpp b/Tests/unit/core/test_dataelementfile.cpp
index 35a61980db..1dffb9607c 100644
--- a/Tests/unit/core/test_dataelementfile.cpp
+++ b/Tests/unit/core/test_dataelementfile.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_doorbell.cpp b/Tests/unit/core/test_doorbell.cpp
index 56990a4245..ecc6cca21a 100644
--- a/Tests/unit/core/test_doorbell.cpp
+++ b/Tests/unit/core/test_doorbell.cpp
@@ -16,11 +16,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../IPTestAdministrator.h"
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_enumerate.cpp b/Tests/unit/core/test_enumerate.cpp
index aacec7d665..8b53bd78fa 100644
--- a/Tests/unit/core/test_enumerate.cpp
+++ b/Tests/unit/core/test_enumerate.cpp
@@ -17,9 +17,13 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_event.cpp b/Tests/unit/core/test_event.cpp
index 06fe9e25f9..26c75096d8 100644
--- a/Tests/unit/core/test_event.cpp
+++ b/Tests/unit/core/test_event.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 using namespace Thunder;
 using namespace Thunder::Core;
diff --git a/Tests/unit/core/test_filesystem.cpp b/Tests/unit/core/test_filesystem.cpp
index 2dea5b4e53..b51eb51d1c 100644
--- a/Tests/unit/core/test_filesystem.cpp
+++ b/Tests/unit/core/test_filesystem.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_frametype.cpp b/Tests/unit/core/test_frametype.cpp
index 22252e01e0..d79c8a3580 100644
--- a/Tests/unit/core/test_frametype.cpp
+++ b/Tests/unit/core/test_frametype.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_hash.cpp b/Tests/unit/core/test_hash.cpp
index 58c588c65b..0ff9d7db82 100644
--- a/Tests/unit/core/test_hash.cpp
+++ b/Tests/unit/core/test_hash.cpp
@@ -17,12 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 #include <cryptalgo/cryptalgo.h>
-#include <thread>
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_hex2strserialization.cpp b/Tests/unit/core/test_hex2strserialization.cpp
index 03d5dc45a6..6b9075a01b 100644
--- a/Tests/unit/core/test_hex2strserialization.cpp
+++ b/Tests/unit/core/test_hex2strserialization.cpp
@@ -16,11 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../IPTestAdministrator.h"
+
 #include <functional>
 #include <sstream>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include "core/core.h"
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_ipc.cpp b/Tests/unit/core/test_ipc.cpp
index 4a8217ce38..4bfea2226a 100644
--- a/Tests/unit/core/test_ipc.cpp
+++ b/Tests/unit/core/test_ipc.cpp
@@ -17,11 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_ipcclient.cpp b/Tests/unit/core/test_ipcclient.cpp
index 016dfdc965..9edd7ae49c 100644
--- a/Tests/unit/core/test_ipcclient.cpp
+++ b/Tests/unit/core/test_ipcclient.cpp
@@ -17,11 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_iso639.cpp b/Tests/unit/core/test_iso639.cpp
index 2d38cd3932..71f1446a1a 100644
--- a/Tests/unit/core/test_iso639.cpp
+++ b/Tests/unit/core/test_iso639.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_iterator.cpp b/Tests/unit/core/test_iterator.cpp
index be26042cf8..8d656ecd78 100644
--- a/Tests/unit/core/test_iterator.cpp
+++ b/Tests/unit/core/test_iterator.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_jsonparser.cpp b/Tests/unit/core/test_jsonparser.cpp
index 684a330904..8cccbf459b 100644
--- a/Tests/unit/core/test_jsonparser.cpp
+++ b/Tests/unit/core/test_jsonparser.cpp
@@ -19,14 +19,16 @@
 
 #include <functional>
 #include <sstream>
+#include <string>
 
 #include <gtest/gtest.h>
 
-#include "../IPTestAdministrator.h"
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+ 
 #include <core/core.h>
 
-#include <string>
-
 namespace Thunder {
     enum class JSONTestEnum {
         ENUM_1,
diff --git a/Tests/unit/core/test_keyvalue.cpp b/Tests/unit/core/test_keyvalue.cpp
index 12089ab7fe..e60b8ac6b0 100644
--- a/Tests/unit/core/test_keyvalue.cpp
+++ b/Tests/unit/core/test_keyvalue.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_library.cpp b/Tests/unit/core/test_library.cpp
index dc2aa207c7..b6aa99ae57 100644
--- a/Tests/unit/core/test_library.cpp
+++ b/Tests/unit/core/test_library.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_lockablecontainer.cpp b/Tests/unit/core/test_lockablecontainer.cpp
index 76a42faa7e..634d197578 100644
--- a/Tests/unit/core/test_lockablecontainer.cpp
+++ b/Tests/unit/core/test_lockablecontainer.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+ 
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_measurementtype.cpp b/Tests/unit/core/test_measurementtype.cpp
index bcd96f2f16..fed7764b6a 100644
--- a/Tests/unit/core/test_measurementtype.cpp
+++ b/Tests/unit/core/test_measurementtype.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_memberavailability.cpp b/Tests/unit/core/test_memberavailability.cpp
index df8306414f..0b437afd88 100644
--- a/Tests/unit/core/test_memberavailability.cpp
+++ b/Tests/unit/core/test_memberavailability.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_messageException.cpp b/Tests/unit/core/test_messageException.cpp
index 377d17d2f4..86180ddbdf 100644
--- a/Tests/unit/core/test_messageException.cpp
+++ b/Tests/unit/core/test_messageException.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+ 
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_message_dispatcher.cpp b/Tests/unit/core/test_message_dispatcher.cpp
index e3419552d5..c741e48445 100644
--- a/Tests/unit/core/test_message_dispatcher.cpp
+++ b/Tests/unit/core/test_message_dispatcher.cpp
@@ -17,13 +17,17 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <fstream>
 
-#include <core/core.h>
 #include <gtest/gtest.h>
 
-#include <core/FileObserver.h>
-#include <fstream>
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_message_unit.cpp b/Tests/unit/core/test_message_unit.cpp
index 7610a8cc4c..ff3e3bfda6 100644
--- a/Tests/unit/core/test_message_unit.cpp
+++ b/Tests/unit/core/test_message_unit.cpp
@@ -17,11 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
-#include <messaging/messaging.h>
 
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
+
+#include "../IPTestAdministrator.h"
+ 
 using namespace Thunder;
 
 class Control : public Core::Messaging::IControl {
diff --git a/Tests/unit/core/test_networkinfo.cpp b/Tests/unit/core/test_networkinfo.cpp
index 96892dfb42..b09b5d70cc 100644
--- a/Tests/unit/core/test_networkinfo.cpp
+++ b/Tests/unit/core/test_networkinfo.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_nodeid.cpp b/Tests/unit/core/test_nodeid.cpp
index 026264e4f8..7ff22fcccf 100644
--- a/Tests/unit/core/test_nodeid.cpp
+++ b/Tests/unit/core/test_nodeid.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_numbertype.cpp b/Tests/unit/core/test_numbertype.cpp
index 05d3f4682d..5bc5a658bb 100644
--- a/Tests/unit/core/test_numbertype.cpp
+++ b/Tests/unit/core/test_numbertype.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_optional.cpp b/Tests/unit/core/test_optional.cpp
index ba0961cc05..c802dbeeab 100644
--- a/Tests/unit/core/test_optional.cpp
+++ b/Tests/unit/core/test_optional.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_parser.cpp b/Tests/unit/core/test_parser.cpp
index e0d3672698..9ba7053626 100644
--- a/Tests/unit/core/test_parser.cpp
+++ b/Tests/unit/core/test_parser.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_portability.cpp b/Tests/unit/core/test_portability.cpp
index a4c706522a..24e448615b 100644
--- a/Tests/unit/core/test_portability.cpp
+++ b/Tests/unit/core/test_portability.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 using namespace Thunder;
 using namespace Thunder::Core;
diff --git a/Tests/unit/core/test_processinfo.cpp b/Tests/unit/core/test_processinfo.cpp
index a3b10e97d0..5ab22f4a9c 100644
--- a/Tests/unit/core/test_processinfo.cpp
+++ b/Tests/unit/core/test_processinfo.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_queue.cpp b/Tests/unit/core/test_queue.cpp
index 80a765e3a3..80c5e237ac 100644
--- a/Tests/unit/core/test_queue.cpp
+++ b/Tests/unit/core/test_queue.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_rangetype.cpp b/Tests/unit/core/test_rangetype.cpp
index 0da321e63e..d5aa747099 100644
--- a/Tests/unit/core/test_rangetype.cpp
+++ b/Tests/unit/core/test_rangetype.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 namespace Thunder {
diff --git a/Tests/unit/core/test_readwritelock.cpp b/Tests/unit/core/test_readwritelock.cpp
index 80725dd85d..18c72583b5 100644
--- a/Tests/unit/core/test_readwritelock.cpp
+++ b/Tests/unit/core/test_readwritelock.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+ 
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_rectangle.cpp b/Tests/unit/core/test_rectangle.cpp
index 27faeef084..2900036b8c 100644
--- a/Tests/unit/core/test_rectangle.cpp
+++ b/Tests/unit/core/test_rectangle.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_rpc.cpp b/Tests/unit/core/test_rpc.cpp
index de3ce2a1f4..bac4cd4d6d 100644
--- a/Tests/unit/core/test_rpc.cpp
+++ b/Tests/unit/core/test_rpc.cpp
@@ -17,13 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
 
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+ 
 #include <core/core.h>
 #include <com/com.h>
-#include <core/Portability.h>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Exchange {
diff --git a/Tests/unit/core/test_semaphore.cpp b/Tests/unit/core/test_semaphore.cpp
index 556fba1bc6..356aaf7104 100644
--- a/Tests/unit/core/test_semaphore.cpp
+++ b/Tests/unit/core/test_semaphore.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 using namespace Thunder;
 using namespace Thunder::Core;
diff --git a/Tests/unit/core/test_sharedbuffer.cpp b/Tests/unit/core/test_sharedbuffer.cpp
index df4650ca9d..c3577700f7 100644
--- a/Tests/unit/core/test_sharedbuffer.cpp
+++ b/Tests/unit/core/test_sharedbuffer.cpp
@@ -17,11 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_singleton.cpp b/Tests/unit/core/test_singleton.cpp
index b9d42e74ee..26a1acf184 100644
--- a/Tests/unit/core/test_singleton.cpp
+++ b/Tests/unit/core/test_singleton.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_socketstreamjson.cpp b/Tests/unit/core/test_socketstreamjson.cpp
index 23afc4ab3d..337491e46d 100644
--- a/Tests/unit/core/test_socketstreamjson.cpp
+++ b/Tests/unit/core/test_socketstreamjson.cpp
@@ -17,13 +17,18 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
-#include <gtest/gtest.h>
-#include <core/core.h>
-#include <websocket/websocket.h>
 #include <condition_variable>
 #include <mutex>
+ 
+#include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_socketstreamtext.cpp b/Tests/unit/core/test_socketstreamtext.cpp
index 7272f421a0..6a613e8768 100644
--- a/Tests/unit/core/test_socketstreamtext.cpp
+++ b/Tests/unit/core/test_socketstreamtext.cpp
@@ -17,13 +17,18 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <condition_variable>
+#include <mutex>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <websocket/websocket.h>
-#include <condition_variable>
-#include <mutex>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_statetrigger.cpp b/Tests/unit/core/test_statetrigger.cpp
index 6c92bf06dd..48d514df3e 100644
--- a/Tests/unit/core/test_statetrigger.cpp
+++ b/Tests/unit/core/test_statetrigger.cpp
@@ -16,9 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../IPTestAdministrator.h"
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_stopwatch.cpp b/Tests/unit/core/test_stopwatch.cpp
index 48a6b94790..97b11a5081 100644
--- a/Tests/unit/core/test_stopwatch.cpp
+++ b/Tests/unit/core/test_stopwatch.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_synchronize.cpp b/Tests/unit/core/test_synchronize.cpp
index 2cb5f57d66..8fcec033f6 100644
--- a/Tests/unit/core/test_synchronize.cpp
+++ b/Tests/unit/core/test_synchronize.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_synchronous.cpp b/Tests/unit/core/test_synchronous.cpp
index 70083770f9..700aab9aa7 100644
--- a/Tests/unit/core/test_synchronous.cpp
+++ b/Tests/unit/core/test_synchronous.cpp
@@ -17,11 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
+#include "../IPTestAdministrator.h"
+
 using namespace Thunder;
 using namespace Thunder::Core;
 
diff --git a/Tests/unit/core/test_systeminfo.cpp b/Tests/unit/core/test_systeminfo.cpp
index 56e517e966..b1784f72db 100644
--- a/Tests/unit/core/test_systeminfo.cpp
+++ b/Tests/unit/core/test_systeminfo.cpp
@@ -17,17 +17,20 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <fstream>
-
-#include <gtest/gtest.h>
-#include <core/core.h>
 #include <sys/utsname.h>
 #include <inttypes.h>
 #include <unistd.h>
 #include <sys/sysinfo.h>
 
+#include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_textfragment.cpp b/Tests/unit/core/test_textfragment.cpp
index fde006b6c9..ff2e979ef8 100644
--- a/Tests/unit/core/test_textfragment.cpp
+++ b/Tests/unit/core/test_textfragment.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_textreader.cpp b/Tests/unit/core/test_textreader.cpp
index 864c000ee5..f075fb3cc5 100644
--- a/Tests/unit/core/test_textreader.cpp
+++ b/Tests/unit/core/test_textreader.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_thread.cpp b/Tests/unit/core/test_thread.cpp
index defbf25028..2ef0e2aafd 100644
--- a/Tests/unit/core/test_thread.cpp
+++ b/Tests/unit/core/test_thread.cpp
@@ -17,12 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <condition_variable>
+#include <mutex>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <condition_variable>
-#include <mutex>
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_threadpool.cpp b/Tests/unit/core/test_threadpool.cpp
index 42443a27b5..29295cf006 100644
--- a/Tests/unit/core/test_threadpool.cpp
+++ b/Tests/unit/core/test_threadpool.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 using namespace Thunder;
 using namespace Thunder::Core;
diff --git a/Tests/unit/core/test_time.cpp b/Tests/unit/core/test_time.cpp
index 0e193ba557..3a3ca588e9 100644
--- a/Tests/unit/core/test_time.cpp
+++ b/Tests/unit/core/test_time.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <ctime>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <ctime>
 
 using namespace Thunder;
 using namespace Thunder::Core;
diff --git a/Tests/unit/core/test_timer.cpp b/Tests/unit/core/test_timer.cpp
index a919d792d4..0e91402e2f 100644
--- a/Tests/unit/core/test_timer.cpp
+++ b/Tests/unit/core/test_timer.cpp
@@ -17,12 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <condition_variable>
+#include <mutex>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <condition_variable>
-#include <mutex>
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_tracing.cpp b/Tests/unit/core/test_tracing.cpp
index 0d32cb406e..b85ff04c75 100644
--- a/Tests/unit/core/test_tracing.cpp
+++ b/Tests/unit/core/test_tracing.cpp
@@ -17,13 +17,16 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
-#include <tracing/tracing.h>
-#include <tracing/TraceUnit.h>
-#include <core/Time.h>
 
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
+
+#include "../IPTestAdministrator.h"
+ 
 using namespace Thunder;
 using namespace Thunder::Core;
 
@@ -348,4 +351,4 @@ TEST(Core_tracing, simpleTracingReversed)
 
     testAdmin.WaitForChildCompletion();
     Singleton::Dispose();
-}
\ No newline at end of file
+}
diff --git a/Tests/unit/core/test_tristate.cpp b/Tests/unit/core/test_tristate.cpp
index 2d71c0c524..7067c55915 100644
--- a/Tests/unit/core/test_tristate.cpp
+++ b/Tests/unit/core/test_tristate.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_valuerecorder.cpp b/Tests/unit/core/test_valuerecorder.cpp
index ac939d8fe2..f7e8446fb3 100644
--- a/Tests/unit/core/test_valuerecorder.cpp
+++ b/Tests/unit/core/test_valuerecorder.cpp
@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include "gtest/gtest.h"
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include "core/core.h"
 
 using namespace Thunder;
diff --git a/Tests/unit/core/test_weblinkjson.cpp b/Tests/unit/core/test_weblinkjson.cpp
index f811a24ab3..a9821292ca 100644
--- a/Tests/unit/core/test_weblinkjson.cpp
+++ b/Tests/unit/core/test_weblinkjson.cpp
@@ -17,12 +17,17 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 #include <websocket/websocket.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_weblinktext.cpp b/Tests/unit/core/test_weblinktext.cpp
index 49d135c0ad..fcf37dcca8 100644
--- a/Tests/unit/core/test_weblinktext.cpp
+++ b/Tests/unit/core/test_weblinktext.cpp
@@ -17,12 +17,17 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 #include <websocket/websocket.h>
 
+#include "../IPTestAdministrator.h"
+
 namespace Thunder {
 namespace Tests {
 
diff --git a/Tests/unit/core/test_websocketjson.cpp b/Tests/unit/core/test_websocketjson.cpp
index 4f9e19c19b..54809313ed 100644
--- a/Tests/unit/core/test_websocketjson.cpp
+++ b/Tests/unit/core/test_websocketjson.cpp
@@ -17,13 +17,19 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <condition_variable>
+#include <mutex>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 #include <websocket/websocket.h>
-#include <condition_variable>
-#include <mutex>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_websockettext.cpp b/Tests/unit/core/test_websockettext.cpp
index 6753e9ab54..c118e7e535 100644
--- a/Tests/unit/core/test_websockettext.cpp
+++ b/Tests/unit/core/test_websockettext.cpp
@@ -17,13 +17,19 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <condition_variable>
+#include <mutex>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
 #include <websocket/websocket.h>
-#include <condition_variable>
-#include <mutex>
+
+#include "../IPTestAdministrator.h"
 
 namespace Thunder {
 namespace Tests {
diff --git a/Tests/unit/core/test_workerpool.cpp b/Tests/unit/core/test_workerpool.cpp
index e1820c4aa9..a9bbae4986 100644
--- a/Tests/unit/core/test_workerpool.cpp
+++ b/Tests/unit/core/test_workerpool.cpp
@@ -17,11 +17,15 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
+#include <thread>
 
 #include <gtest/gtest.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
 #include <core/core.h>
-#include <thread>
 
 using namespace Thunder; using namespace Thunder::Core;
 
diff --git a/Tests/unit/core/test_xgetopt.cpp b/Tests/unit/core/test_xgetopt.cpp
index 27feec7c83..320411080e 100644
--- a/Tests/unit/core/test_xgetopt.cpp
+++ b/Tests/unit/core/test_xgetopt.cpp
@@ -17,10 +17,13 @@
  * limitations under the License.
  */
 
-#include "../IPTestAdministrator.h"
-
 #include <gtest/gtest.h>
-#include <core/XGetopt.h>
+
+#ifndef MODULE_NAME
+#include "../Module.h"
+#endif
+
+#include <core/core.h>
 
 int argumentCount = 3;
 char* arguments[]= {(char*)"-c", (char*)"-h", (char*)"-b"};