diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7865300..feaa4b81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ endif()
 option(FSFW_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON)
 # Options to exclude parts of the FSFW from compilation.
 option(FSFW_ADD_INTERNAL_TESTS "Add internal unit tests" ON)
+option(FSFW_ADD_UNITTESTS "Add regular unittests. Requires Catch2" OFF)
 option(FSFW_ADD_HAL "Add Hardware Abstraction Layer" ON)
 
 # Optional sources
@@ -38,7 +39,7 @@ elseif(${CMAKE_CXX_STANDARD} LESS 11)
 endif()
 
 # Backwards comptability
-if(OS_FSFW)
+if(OS_FSFW AND NOT FSFW_OSAL)
     message(WARNING "Please pass the FSFW OSAL as FSFW_OSAL instead of OS_FSFW")
     set(FSFW_OSAL OS_FSFW)
 endif()
diff --git a/tests/src/fsfw_tests/unit/CMakeLists.txt b/tests/src/fsfw_tests/unit/CMakeLists.txt
index 255063f3..01e4d19c 100644
--- a/tests/src/fsfw_tests/unit/CMakeLists.txt
+++ b/tests/src/fsfw_tests/unit/CMakeLists.txt
@@ -1,3 +1,16 @@
+target_sources(${TARGET_NAME} PRIVATE
+    CatchDefinitions.cpp
+    CatchFactory.cpp
+    printChar.cpp
+)
+
+if(FSFW_CUSTOM_UNITTEST_RUNNER)
+    target_sources(${TARGET_NAME} PRIVATE
+        CatchRunner.cpp
+        CatchSetup.cpp
+    )
+endif()
+
 add_subdirectory(action)
 add_subdirectory(container)
 add_subdirectory(osal)
diff --git a/tests/user/unittest/core/CatchDefinitions.cpp b/tests/src/fsfw_tests/unit/CatchDefinitions.cpp
similarity index 100%
rename from tests/user/unittest/core/CatchDefinitions.cpp
rename to tests/src/fsfw_tests/unit/CatchDefinitions.cpp
diff --git a/tests/user/unittest/core/CatchDefinitions.h b/tests/src/fsfw_tests/unit/CatchDefinitions.h
similarity index 100%
rename from tests/user/unittest/core/CatchDefinitions.h
rename to tests/src/fsfw_tests/unit/CatchDefinitions.h
diff --git a/tests/user/unittest/core/CatchFactory.cpp b/tests/src/fsfw_tests/unit/CatchFactory.cpp
similarity index 91%
rename from tests/user/unittest/core/CatchFactory.cpp
rename to tests/src/fsfw_tests/unit/CatchFactory.cpp
index ff591b8e..010ab5dd 100644
--- a/tests/user/unittest/core/CatchFactory.cpp
+++ b/tests/src/fsfw_tests/unit/CatchFactory.cpp
@@ -1,17 +1,21 @@
 #include "CatchFactory.h"
+#include "datapoollocal/LocalPoolOwnerBase.h"
+#include "mocks/HkReceiverMock.h"
+
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 
 #include <fsfw/events/EventManager.h>
 #include <fsfw/health/HealthTable.h>
-#include <fsfw/internalError/InternalErrorReporter.h>
+#include <fsfw/internalerror/InternalErrorReporter.h>
 #include <fsfw/objectmanager/frameworkObjects.h>
 #include <fsfw/storagemanager/PoolManager.h>
 #include <fsfw/tmtcpacket/pus/tm/TmPacketStored.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/unittest/tests/datapoollocal/LocalPoolOwnerBase.h>
-#include <fsfw/unittest/tests/mocks/HkReceiverMock.h>
+
+
+#if FSFW_ADD_DEFAULT_FACTORY_FUNCTIONS == 1
 
 /**
  * @brief Produces system objects.
@@ -26,7 +30,7 @@
  *
  * @ingroup init
  */
-void Factory::produce(void) {
+void Factory::produceFrameworkObjects(void* args) {
 	setStaticFrameworkObjectIds();
 	new EventManager(objects::EVENT_MANAGER);
 	new HealthTable(objects::HEALTH_TABLE);
@@ -55,7 +59,6 @@ void Factory::produce(void) {
         };
 		new PoolManager(objects::IPC_STORE, poolCfg);
 	}
-
 }
 
 void Factory::setStaticFrameworkObjectIds() {
@@ -77,5 +80,4 @@ void Factory::setStaticFrameworkObjectIds() {
 	TmPacketBase::timeStamperId = objects::NO_OBJECT;
 }
 
-
-
+#endif
diff --git a/tests/src/fsfw_tests/unit/CatchFactory.h b/tests/src/fsfw_tests/unit/CatchFactory.h
new file mode 100644
index 00000000..ae0629e5
--- /dev/null
+++ b/tests/src/fsfw_tests/unit/CatchFactory.h
@@ -0,0 +1,24 @@
+#ifndef FSFW_CATCHFACTORY_H_
+#define FSFW_CATCHFACTORY_H_
+
+#include "TestConfig.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+#include "fsfw/objectmanager/ObjectManager.h"
+
+// TODO: It is possible to solve this more cleanly using a special class which
+// is allowed to set the object IDs and has virtual functions.
+#if FSFW_ADD_DEFAULT_FACTORY_FUNCTIONS == 1
+
+namespace Factory {
+	/**
+	 * @brief 	Creates all SystemObject elements which are persistent
+	 * 			during execution.
+	 */
+	void produceFrameworkObjects(void* args);
+	void setStaticFrameworkObjectIds();
+
+}
+
+#endif /* FSFW_ADD_DEFAULT_FSFW_FACTORY == 1 */
+
+#endif /* FSFW_CATCHFACTORY_H_ */
diff --git a/tests/user/unittest/core/CatchRunner.cpp b/tests/src/fsfw_tests/unit/CatchRunner.cpp
similarity index 78%
rename from tests/user/unittest/core/CatchRunner.cpp
rename to tests/src/fsfw_tests/unit/CatchRunner.cpp
index 886d641f..c96db7f4 100644
--- a/tests/user/unittest/core/CatchRunner.cpp
+++ b/tests/src/fsfw_tests/unit/CatchRunner.cpp
@@ -6,7 +6,7 @@
  * from the eclipse market place to get colored characters.
  */
 
-#include <TestsConfig.h>
+#include "CatchRunner.h"
 
 #define CATCH_CONFIG_COLOUR_WINDOWS
 
@@ -14,11 +14,11 @@
 
 extern int customSetup();
 
-int main( int argc, char* argv[] ) {
+int fsfwtest::customMain(int argc, char* argv[]) {
     customSetup();
 
     // Catch internal function call
-    int result = Catch::Session().run( argc, argv );
+    int result = Catch::Session().run(argc, argv);
 
     // global clean-up
     return result;
diff --git a/tests/src/fsfw_tests/unit/CatchRunner.h b/tests/src/fsfw_tests/unit/CatchRunner.h
new file mode 100644
index 00000000..720625c6
--- /dev/null
+++ b/tests/src/fsfw_tests/unit/CatchRunner.h
@@ -0,0 +1,14 @@
+#ifndef FSFW_TESTS_USER_UNITTEST_CORE_CATCHRUNNER_H_
+#define FSFW_TESTS_USER_UNITTEST_CORE_CATCHRUNNER_H_
+
+namespace fsfwtest {
+
+/**
+ * Can be called by upper level main() if default Catch2 main is overriden
+ * @return
+ */
+int customMain(int argc, char* argv[]);
+
+}
+
+#endif /* FSFW_TESTS_USER_UNITTEST_CORE_CATCHRUNNER_H_ */
diff --git a/tests/user/unittest/core/CatchSetup.cpp b/tests/src/fsfw_tests/unit/CatchSetup.cpp
similarity index 57%
rename from tests/user/unittest/core/CatchSetup.cpp
rename to tests/src/fsfw_tests/unit/CatchSetup.cpp
index bda31400..a0791bc9 100644
--- a/tests/user/unittest/core/CatchSetup.cpp
+++ b/tests/src/fsfw_tests/unit/CatchSetup.cpp
@@ -5,10 +5,9 @@
 #include <gcov.h>
 #endif
 
-#include <fsfw/objectmanager/ObjectManager.h>
-#include <fsfw/objectmanager/ObjectManagerIF.h>
-#include <fsfw/storagemanager/StorageManagerIF.h>
-#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
+#include "fsfw/objectmanager/ObjectManager.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 
 /* Global instantiations normally done in main.cpp */
@@ -24,13 +23,11 @@ ServiceInterfaceStream warning("WARNING");
 }
 #endif
 
-/* Global object manager */
-ObjectManagerIF *objectManager;
-
 int customSetup() {
     // global setup
-    objectManager = new ObjectManager(Factory::produce);
-    objectManager -> initialize();
+    ObjectManager* objMan = ObjectManager::instance();
+    objMan->setObjectFactoryFunction(Factory::produceFrameworkObjects, nullptr);
+    objMan->initialize();
     return 0;
 }
 
diff --git a/tests/src/fsfw_tests/unit/action/TestActionHelper.cpp b/tests/src/fsfw_tests/unit/action/TestActionHelper.cpp
index 126979f6..3129b001 100644
--- a/tests/src/fsfw_tests/unit/action/TestActionHelper.cpp
+++ b/tests/src/fsfw_tests/unit/action/TestActionHelper.cpp
@@ -1,13 +1,10 @@
 #include "TestActionHelper.h"
-
-#include <unittest/core/CatchDefinitions.h>
+#include "fsfw_tests/unit/mocks/MessageQueueMockBase.h"
 
 #include <fsfw/action/ActionHelper.h>
 #include <fsfw/ipc/CommandMessage.h>
-#include <fsfw/tests/unit/mocks/MessageQueueMockBase.h>
 
 #include <catch2/catch_test_macros.hpp>
-
 #include <array>
 
 
diff --git a/tests/src/fsfw_tests/unit/action/TestActionHelper.h b/tests/src/fsfw_tests/unit/action/TestActionHelper.h
index 641ea2c6..34b228c0 100644
--- a/tests/src/fsfw_tests/unit/action/TestActionHelper.h
+++ b/tests/src/fsfw_tests/unit/action/TestActionHelper.h
@@ -1,12 +1,11 @@
 #ifndef UNITTEST_HOSTED_TESTACTIONHELPER_H_
 #define UNITTEST_HOSTED_TESTACTIONHELPER_H_
 
+#include "fsfw_tests/unit/CatchDefinitions.h"
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/ipc/MessageQueueIF.h>
-#include <unittest/core/CatchDefinitions.h>
 #include <cstring>
 
-
 class ActionHelperOwnerMockBase: public HasActionsIF {
 public:
 	bool getCommandQueueCalled = false;
diff --git a/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp b/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
index 32a2502d..819401ab 100644
--- a/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
+++ b/tests/src/fsfw_tests/unit/container/RingBufferTest.cpp
@@ -1,4 +1,4 @@
-#include <unittest/core/CatchDefinitions.h>
+#include "fsfw_tests/unit/CatchDefinitions.h"
 #include <fsfw/container/SimpleRingBuffer.h>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/tests/src/fsfw_tests/unit/container/TestArrayList.cpp b/tests/src/fsfw_tests/unit/container/TestArrayList.cpp
index 1fd330b6..9417144c 100644
--- a/tests/src/fsfw_tests/unit/container/TestArrayList.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestArrayList.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/ArrayList.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 /**
  * @brief 	Array List test
diff --git a/tests/src/fsfw_tests/unit/container/TestDynamicFifo.cpp b/tests/src/fsfw_tests/unit/container/TestDynamicFifo.cpp
index 2b572d52..a1bab3ba 100644
--- a/tests/src/fsfw_tests/unit/container/TestDynamicFifo.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestDynamicFifo.cpp
@@ -1,9 +1,10 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/DynamicFIFO.h>
 #include <fsfw/container/FIFO.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 TEST_CASE( "Dynamic Fifo Tests", "[TestDynamicFifo]") {
 	INFO("Dynamic Fifo Tests");
diff --git a/tests/src/fsfw_tests/unit/container/TestFifo.cpp b/tests/src/fsfw_tests/unit/container/TestFifo.cpp
index fbcd40cc..311dd8fd 100644
--- a/tests/src/fsfw_tests/unit/container/TestFifo.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestFifo.cpp
@@ -1,9 +1,10 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/DynamicFIFO.h>
 #include <fsfw/container/FIFO.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 TEST_CASE( "Static Fifo Tests", "[TestFifo]") {
 	INFO("Fifo Tests");
diff --git a/tests/src/fsfw_tests/unit/container/TestFixedArrayList.cpp b/tests/src/fsfw_tests/unit/container/TestFixedArrayList.cpp
index 1a85f30d..ed597f73 100644
--- a/tests/src/fsfw_tests/unit/container/TestFixedArrayList.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestFixedArrayList.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/FixedArrayList.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 
 TEST_CASE( "FixedArrayList Tests", "[TestFixedArrayList]") {
diff --git a/tests/src/fsfw_tests/unit/container/TestFixedMap.cpp b/tests/src/fsfw_tests/unit/container/TestFixedMap.cpp
index 297171ca..488418b9 100644
--- a/tests/src/fsfw_tests/unit/container/TestFixedMap.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestFixedMap.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/FixedMap.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 template class FixedMap<unsigned int, unsigned short>;
 
diff --git a/tests/src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp b/tests/src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp
index a47d6efb..23d91744 100644
--- a/tests/src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestFixedOrderedMultimap.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/FixedOrderedMultimap.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 TEST_CASE( "FixedOrderedMultimap Tests", "[TestFixedOrderedMultimap]") {
 	INFO("FixedOrderedMultimap Tests");
diff --git a/tests/src/fsfw_tests/unit/container/TestPlacementFactory.cpp b/tests/src/fsfw_tests/unit/container/TestPlacementFactory.cpp
index 14cf8eb4..1e328fc7 100644
--- a/tests/src/fsfw_tests/unit/container/TestPlacementFactory.cpp
+++ b/tests/src/fsfw_tests/unit/container/TestPlacementFactory.cpp
@@ -1,10 +1,11 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/container/PlacementFactory.h>
 #include <fsfw/storagemanager/LocalPool.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
 #include <fsfw/container/ArrayList.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 TEST_CASE( "PlacementFactory Tests", "[TestPlacementFactory]") {
 	INFO("PlacementFactory Tests");
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp b/tests/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp
index b8748eb4..94b13f2f 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp
+++ b/tests/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp
@@ -1,7 +1,5 @@
 #include "LocalPoolOwnerBase.h"
-
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
+#include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
@@ -10,7 +8,8 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/bitutility.h>
 
-#include <unittest/core/CatchDefinitions.h>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 
 TEST_CASE("DataSetTest" , "[DataSetTest]") {
     LocalPoolOwnerBase* poolOwner = ObjectManager::instance()->
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
index 4a4d08fb..7b2f9412 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
+++ b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
@@ -1,7 +1,5 @@
 #include "LocalPoolOwnerBase.h"
-
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
+#include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/datapool/PoolReadGuard.h>
@@ -10,7 +8,10 @@
 #include <fsfw/housekeeping/HousekeepingSnapshot.h>
 #include <fsfw/ipc/CommandMessageCleaner.h>
 #include <fsfw/timemanager/CCSDSTime.h>
-#include <unittest/core/CatchDefinitions.h>
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
+
 #include <iostream>
 
 
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h
index c0e41ddf..ea5bb7e0 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h
+++ b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h
@@ -2,6 +2,7 @@
 #define FSFW_UNITTEST_TESTS_DATAPOOLLOCAL_LOCALPOOLOWNERBASE_H_
 
 #include "objects/systemObjectList.h"
+#include "../mocks/MessageQueueMockBase.h"
 
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
 #include <fsfw/datapoollocal/LocalDataSet.h>
@@ -10,7 +11,6 @@
 #include <fsfw/datapoollocal/LocalPoolVector.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
-#include <fsfw/tests/unit/mocks/MessageQueueMockBase.h>
 #include <fsfw/datapool/PoolReadGuard.h>
 
 namespace lpool {
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp
index 514d8125..648a76e2 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp
+++ b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp
@@ -1,10 +1,10 @@
 #include "LocalPoolOwnerBase.h"
+#include "fsfw_tests/unit/CatchDefinitions.h"
 
-#include <catch2/catch_test_macros.hpp>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
-#include <unittest/core/CatchDefinitions.h>
 
+#include <catch2/catch_test_macros.hpp>
 
 TEST_CASE("LocalPoolVariable" , "[LocPoolVarTest]") {
     LocalPoolOwnerBase* poolOwner = ObjectManager::instance()->
diff --git a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp
index 5b3dd105..3f846dec 100644
--- a/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp
+++ b/tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp
@@ -1,9 +1,10 @@
 #include "LocalPoolOwnerBase.h"
+#include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <catch2/catch_test_macros.hpp>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
-#include <unittest/core/CatchDefinitions.h>
+
 
 TEST_CASE("LocalPoolVector" , "[LocPoolVecTest]") {
     LocalPoolOwnerBase* poolOwner = ObjectManager::instance()->
diff --git a/tests/src/fsfw_tests/unit/mocks/MessageQueueMockBase.h b/tests/src/fsfw_tests/unit/mocks/MessageQueueMockBase.h
index 3000f7fb..93a00b7a 100644
--- a/tests/src/fsfw_tests/unit/mocks/MessageQueueMockBase.h
+++ b/tests/src/fsfw_tests/unit/mocks/MessageQueueMockBase.h
@@ -1,9 +1,12 @@
 #ifndef FSFW_UNITTEST_TESTS_MOCKS_MESSAGEQUEUEMOCKBASE_H_
 #define FSFW_UNITTEST_TESTS_MOCKS_MESSAGEQUEUEMOCKBASE_H_
 
-#include <fsfw/ipc/MessageQueueIF.h>
-#include <fsfw/ipc/MessageQueueMessage.h>
-#include <unittest/core/CatchDefinitions.h>
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+
 #include <cstring>
 
 #include <queue>
diff --git a/tests/src/fsfw_tests/unit/osal/TestMessageQueue.cpp b/tests/src/fsfw_tests/unit/osal/TestMessageQueue.cpp
index e33b7240..07197bf7 100644
--- a/tests/src/fsfw_tests/unit/osal/TestMessageQueue.cpp
+++ b/tests/src/fsfw_tests/unit/osal/TestMessageQueue.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/ipc/MessageQueueIF.h>
 #include <fsfw/ipc/QueueFactory.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 #include <array>
 
diff --git a/tests/user/unittest/core/printChar.cpp b/tests/src/fsfw_tests/unit/printChar.cpp
similarity index 100%
rename from tests/user/unittest/core/printChar.cpp
rename to tests/src/fsfw_tests/unit/printChar.cpp
diff --git a/tests/user/unittest/core/printChar.h b/tests/src/fsfw_tests/unit/printChar.h
similarity index 100%
rename from tests/user/unittest/core/printChar.h
rename to tests/src/fsfw_tests/unit/printChar.h
diff --git a/tests/src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp b/tests/src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp
index 1938746d..01d75881 100644
--- a/tests/src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp
+++ b/tests/src/fsfw_tests/unit/serialize/TestSerialBufferAdapter.cpp
@@ -1,7 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/serialize/SerialBufferAdapter.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
+
 
 #include <array>
 
diff --git a/tests/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp b/tests/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp
index b90ae9f8..b6bb214d 100644
--- a/tests/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp
+++ b/tests/src/fsfw_tests/unit/serialize/TestSerialLinkedPacket.cpp
@@ -1,10 +1,9 @@
 #include "TestSerialLinkedPacket.h"
-#include <unittest/core/CatchDefinitions.h>
+#include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <fsfw/globalfunctions/arrayprinter.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 #include <array>
 
diff --git a/tests/src/fsfw_tests/unit/serialize/TestSerialization.cpp b/tests/src/fsfw_tests/unit/serialize/TestSerialization.cpp
index 3de581ec..64deae3b 100644
--- a/tests/src/fsfw_tests/unit/serialize/TestSerialization.cpp
+++ b/tests/src/fsfw_tests/unit/serialize/TestSerialization.cpp
@@ -1,8 +1,8 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
 #include <fsfw/serialize/SerializeAdapter.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 #include <array>
 
diff --git a/tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp b/tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp
index 10d05c6b..bd1634b7 100644
--- a/tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp
+++ b/tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp
@@ -1,6 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/storagemanager/LocalPool.h>
+
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
+
 #include <array>
 #include <cstring>
 
diff --git a/tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp b/tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp
index d05a3dd6..013ecf86 100644
--- a/tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp
+++ b/tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp
@@ -1,8 +1,9 @@
+#include "fsfw_tests/unit/CatchDefinitions.h"
+
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/storagemanager/LocalPool.h>
 
 #include <catch2/catch_test_macros.hpp>
-#include <unittest/core/CatchDefinitions.h>
 
 #include <cstring>
 
diff --git a/tests/user/CMakeLists.txt b/tests/user/CMakeLists.txt
index df16c756..2e1fdee3 100644
--- a/tests/user/CMakeLists.txt
+++ b/tests/user/CMakeLists.txt
@@ -32,7 +32,7 @@ if(NOT FSFW_OSAL)
 	set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
 endif()
 
-option(CUSTOM_UNITTEST_RUNNER 
+option(FSFW_CUSTOM_UNITTEST_RUNNER 
 	"Specify whether custom main or Catch2 main is used" TRUE
 )
 
@@ -49,7 +49,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # Set names and variables
 set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
-if(CUSTOM_UNITTEST_RUNNER)
+if(FSFW_CUSTOM_UNITTEST_RUNNER)
 	set(CATCH2_TARGET Catch2)
 else()
 	set(CATCH2_TARGET Catch2WithMain)
diff --git a/tests/user/testcfg/TestsConfig.h.in b/tests/user/testcfg/TestsConfig.h.in
index 0341583d..7d950070 100644
--- a/tests/user/testcfg/TestsConfig.h.in
+++ b/tests/user/testcfg/TestsConfig.h.in
@@ -1,6 +1,8 @@
 #ifndef FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_
 #define FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_
 
+#define FSFW_ADD_DEFAULT_FACTORY_FUNCTIONS 1
+
 #ifdef __cplusplus
 
 #include "objects/systemObjectList.h"
diff --git a/tests/user/unittest/CMakeLists.txt b/tests/user/unittest/CMakeLists.txt
deleted file mode 100644
index ad6d4787..00000000
--- a/tests/user/unittest/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(core)
diff --git a/tests/user/unittest/core/CMakeLists.txt b/tests/user/unittest/core/CMakeLists.txt
deleted file mode 100644
index 0989926c..00000000
--- a/tests/user/unittest/core/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-target_sources(${TARGET_NAME} PRIVATE
-	CatchDefinitions.cpp
-	CatchFactory.cpp
-	CatchRunner.cpp
-	CatchSetup.cpp
-	printChar.cpp
-)
-
-if(CUSTOM_UNITTEST_RUNNER)
-	target_sources(${TARGET_NAME} PRIVATE
-		CatchRunner.cpp
-	)
-endif()
\ No newline at end of file
diff --git a/tests/user/unittest/core/CatchFactory.h b/tests/user/unittest/core/CatchFactory.h
deleted file mode 100644
index 024f762e..00000000
--- a/tests/user/unittest/core/CatchFactory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef FSFW_CATCHFACTORY_H_
-#define FSFW_CATCHFACTORY_H_
-
-#include <fsfw/objectmanager/SystemObjectIF.h>
-
-namespace Factory {
-	/**
-	 * @brief 	Creates all SystemObject elements which are persistent
-	 * 			during execution.
-	 */
-	void produce(void* args);
-	void setStaticFrameworkObjectIds();
-
-}
-
-#endif /* FSFW_CATCHFACTORY_H_ */
diff --git a/tests/user/unittest/core/core.mk b/tests/user/unittest/core/core.mk
deleted file mode 100644
index 3e5626d3..00000000
--- a/tests/user/unittest/core/core.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)
-
-INCLUDES += $(CURRENTPATH)
\ No newline at end of file