diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp
index 6aa9bf7..56b45a1 100644
--- a/example/core/GenericFactory.cpp
+++ b/example/core/GenericFactory.cpp
@@ -116,7 +116,8 @@ void ObjectFactory::produceGenericObjects() {
 
 #if OBSW_CONTROLLER_PRINTOUT == 1
 #endif
-    new TestController(objects::TEST_CONTROLLER);
+    new TestController(objects::TEST_CONTROLLER, objects::TEST_DEVICE_HANDLER_0,
+            objects::TEST_DEVICE_HANDLER_1);
 
 #endif /* OBSW_ADD_CONTROLLER_DEMO == 1 */
 
diff --git a/stm32h7/STM32TestTask.cpp b/stm32h7/STM32TestTask.cpp
index e55a5f1..e4ad870 100644
--- a/stm32h7/STM32TestTask.cpp
+++ b/stm32h7/STM32TestTask.cpp
@@ -3,8 +3,7 @@
 #include "OBSWConfig.h"
 
 STM32TestTask::STM32TestTask(object_id_t objectId, bool enablePrintout,
-		bool blinkyLed): TestTask(objectId, enablePrintout),
-		blinkyLed(blinkyLed) {
+		bool blinkyLed): TestTask(objectId), blinkyLed(blinkyLed) {
     BSP_LED_Init(LED1);
     BSP_LED_Init(LED2);
     BSP_LED_Init(LED3);
diff --git a/stm32h7/STM32TestTask.h b/stm32h7/STM32TestTask.h
index e67b546..424f7b8 100644
--- a/stm32h7/STM32TestTask.h
+++ b/stm32h7/STM32TestTask.h
@@ -1,7 +1,7 @@
 #ifndef BSP_STM32_BOARDTEST_STM32TESTTASK_H_
 #define BSP_STM32_BOARDTEST_STM32TESTTASK_H_
 
-#include "../test/TestTask.h"
+#include "fsfw_tests/integration/task/TestTask.h"
 
 class STM32TestTask: public TestTask {
 public: