diff --git a/fsfw b/fsfw
index 160ff799..46a1c2ba 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 160ff799ace61e24708dcf1fdeaf5fafdf23a4ca
+Subproject commit 46a1c2bacea142994666b2201acf0246ba0fd0b4
diff --git a/test/gpio/CMakeLists.txt b/test/gpio/CMakeLists.txt
index 4ba24fd5..47ced202 100644
--- a/test/gpio/CMakeLists.txt
+++ b/test/gpio/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PUBLIC DummyGpioIF.cpp)
-
-target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_sources(${LIB_EIVE_MISSION} PUBLIC DummyGpioIF.cpp)
diff --git a/test/testtasks/CMakeLists.txt b/test/testtasks/CMakeLists.txt
index c0d6ed09..a816e7d2 100644
--- a/test/testtasks/CMakeLists.txt
+++ b/test/testtasks/CMakeLists.txt
@@ -1,3 +1 @@
-target_sources(${OBSW_NAME} PUBLIC TestTask.cpp)
-
-target_include_directories(${OBSW_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_sources(${LIB_EIVE_MISSION} PUBLIC TestTask.cpp)
diff --git a/unittest/controller/testThermalController.cpp b/unittest/controller/testThermalController.cpp
index 976f3c4b..e5b0c050 100644
--- a/unittest/controller/testThermalController.cpp
+++ b/unittest/controller/testThermalController.cpp
@@ -1,5 +1,6 @@
 #include <dummies/SusDummy.h>
 #include <fsfw/ipc/QueueFactory.h>
+#include <fsfw/power/DummyPowerSwitcher.h>
 #include <fsfw/tasks/PeriodicTaskIF.h>
 #include <fsfw/tasks/TaskFactory.h>
 #include <mission/controller/ThermalController.h>
@@ -8,18 +9,24 @@
 
 #include "../../dummies/TemperatureSensorInserter.h"
 #include "../testEnvironment.h"
+#include "mission/core/GenericFactory.h"
+#include "test/gpio/DummyGpioIF.h"
 
 TEST_CASE("Thermal Controller", "[ThermalController]") {
   const object_id_t THERMAL_CONTROLLER_ID = 0x123;
 
   new TemperatureSensorInserter(objects::THERMAL_TEMP_INSERTER);
+  auto dummyGpioIF = new DummyGpioIF();
+  auto dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
   // TODO: Create dummy heater handler
-  // new HeaterHandler()
+  HeaterHandler* heaterHandler = nullptr;
+  // new ThermalController(objects::THERMAL_CONTROLLER);
+  ObjectFactory::createGenericHeaterComponents(*dummyGpioIF, *dummySwitcher, heaterHandler);
   new SusDummy();
 
   // testEnvironment::initialize();
 
-  ThermalController controller(THERMAL_CONTROLLER_ID);
+  ThermalController controller(THERMAL_CONTROLLER_ID, *heaterHandler);
   ReturnValue_t result = controller.initialize();
   REQUIRE(result == returnvalue::OK);