diff --git a/unittest/testcfg/CatchFactory.cpp b/unittest/testcfg/objects/CatchFactory.cpp
similarity index 100%
rename from unittest/testcfg/CatchFactory.cpp
rename to unittest/testcfg/objects/CatchFactory.cpp
diff --git a/unittest/testcfg/CatchFactory.h b/unittest/testcfg/objects/CatchFactory.h
similarity index 100%
rename from unittest/testcfg/CatchFactory.h
rename to unittest/testcfg/objects/CatchFactory.h
diff --git a/unittest/testcfg/objects/Factory.cpp b/unittest/testcfg/objects/Factory.cpp
deleted file mode 100644
index e05b7942..00000000
--- a/unittest/testcfg/objects/Factory.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "Factory.h"
-
-#include <fsfw/events/EventManager.h>
-#include <fsfw/health/HealthTable.h>
-
-#include <fsfw/internalError/InternalErrorReporter.h>
-#include <fsfw/objectmanager/frameworkObjects.h>
-
-/**
- * @brief Produces system objects.
- * @details
- * Build tasks by using SystemObject Interface (Interface).
- * Header files of all tasks must be included
- * Please note that an object has to implement the system object interface
- * if the interface validity is checked or retrieved later by using the
- * get<TargetInterface>(object_id) function from the ObjectManagerIF.
- *
- * Framework objects are created first.
- *
- * @ingroup init
- */
-void Factory::produce(void) {
-	setStaticFrameworkObjectIds();
-	new EventManager(objects::EVENT_MANAGER);
-	new HealthTable(objects::HEALTH_TABLE);
-	new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
-
-}
-
-void Factory::setStaticFrameworkObjectIds() {
-
-}
-
-
diff --git a/unittest/testcfg/objects/Factory.h b/unittest/testcfg/objects/Factory.h
deleted file mode 100644
index 84f9207e..00000000
--- a/unittest/testcfg/objects/Factory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef FACTORY_H_
-#define FACTORY_H_
-
-#include <fsfw/objectmanager/SystemObjectIF.h>
-
-namespace Factory {
-	/**
-	 * @brief 	Creates all SystemObject elements which are persistent
-	 * 			during execution.
-	 */
-	void produce();
-	void setStaticFrameworkObjectIds();
-
-}
-
-#endif /* FACTORY_H_ */