diff --git a/FlippR-Driver/src/output/CabinetItem.h b/FlippR-Driver/src/output/CabinetItem.h
index c2fb837..b06f78c 100644
--- a/FlippR-Driver/src/output/CabinetItem.h
+++ b/FlippR-Driver/src/output/CabinetItem.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_
+#ifndef _SRC_OUTPUT_CABINETITEM_H_
+#define _SRC_OUTPUT_CABINETITEM_H_
 
 #include "ICabinetItem.h"
 
@@ -30,4 +30,4 @@ protected:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_CABINETITEM_H_ */
+#endif /* _SRC_OUTPUT_CABINETITEM_H_ */
diff --git a/FlippR-Driver/src/output/Display.h b/FlippR-Driver/src/output/Display.h
index bc1f4b1..0cd7444 100644
--- a/FlippR-Driver/src/output/Display.h
+++ b/FlippR-Driver/src/output/Display.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_
+#ifndef _SRC_OUTPUT_DISPLAY_H_
+#define _SRC_OUTPUT_DISPLAY_H_
 
 #include "IDisplay.h"
 
@@ -30,4 +30,4 @@ private:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAY_H_ */
+#endif /* _SRC_OUTPUT_DISPLAY_H_ */
diff --git a/FlippR-Driver/src/output/DisplayController.h b/FlippR-Driver/src/output/DisplayController.h
index 2a9563f..4fffdda 100644
--- a/FlippR-Driver/src/output/DisplayController.h
+++ b/FlippR-Driver/src/output/DisplayController.h
@@ -5,25 +5,26 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_
+#ifndef _SRC_OUTPUT_DISPLAYCONTROLLER_H_
+#define _SRC_OUTPUT_DISPLAYCONTROLLER_H_
 
 #include "IDisplayController.h"
 
 #include "utilities/config.h"
-#include "Display.h"
+#include "IDisplay.h"
+
 #include <array>
 namespace output
 {
 
-class DisplayController: public output::IDisplayController {
+class DisplayController: public IDisplayController {
 public:
 	DisplayController();
 	virtual ~DisplayController();
 
 private:
-	std::array<Display, NUMBER_OF_DISPLAYS> displays;
+	std::array<std::unique_ptr<IDisplay>, NUMBER_OF_DISPLAYS> displays;
 };
 
 }
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_DISPLAYCONTROLLER_H_ */
+#endif /* _SRC_OUTPUT_DISPLAYCONTROLLER_H_ */
diff --git a/FlippR-Driver/src/output/ICabinetItem.h b/FlippR-Driver/src/output/ICabinetItem.h
index 760cf3b..316c23f 100644
--- a/FlippR-Driver/src/output/ICabinetItem.h
+++ b/FlippR-Driver/src/output/ICabinetItem.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_
+#ifndef _SRC_OUTPUT_ICABINETITEM_H_
+#define _SRC_OUTPUT_ICABINETITEM_H_
 
 
 class ICabinetItem
@@ -18,4 +18,4 @@ class ICabinetItem
 };
 
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ICABINETITEM_H_ */
+#endif /* _SRC_OUTPUT_ICABINETITEM_H_ */
diff --git a/FlippR-Driver/src/output/IDisplay.h b/FlippR-Driver/src/output/IDisplay.h
index 3445463..8f75ccc 100644
--- a/FlippR-Driver/src/output/IDisplay.h
+++ b/FlippR-Driver/src/output/IDisplay.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_
+#ifndef _SRC_OUTPUT_IDISPLAY_H_
+#define _SRC_OUTPUT_IDISPLAY_H_
 
 namespace output {
 
@@ -22,4 +22,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAY_H_ */
+#endif /* _SRC_OUTPUT_IDISPLAY_H_ */
diff --git a/FlippR-Driver/src/output/IDisplayController.h b/FlippR-Driver/src/output/IDisplayController.h
index 663b74f..70cf80a 100644
--- a/FlippR-Driver/src/output/IDisplayController.h
+++ b/FlippR-Driver/src/output/IDisplayController.h
@@ -5,11 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_
-#include "utilities/config.h"
-#include "IDisplay.h"
-#include <array>
+#ifndef _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
+#define _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
 
 namespace output {
 
@@ -17,11 +14,8 @@ class IDisplayController {
 public:
 	IDisplayController();
 	virtual ~IDisplayController();
-
-private:
-	std::array<IDisplay, NUMBER_OF_DISPLAYS> displays;
 };
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IDISPLAYCONTROLLER_H_ */
+#endif /* _SRC_OUTPUT_IDISPLAYCONTROLLER_H_ */
diff --git a/FlippR-Driver/src/output/ILamp.h b/FlippR-Driver/src/output/ILamp.h
index 972192a..e246896 100644
--- a/FlippR-Driver/src/output/ILamp.h
+++ b/FlippR-Driver/src/output/ILamp.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_
+#ifndef _SRC_OUTPUT_ILAMP_H_
+#define _SRC_OUTPUT_ILAMP_H_
 
 class ILamp
 {
@@ -14,4 +14,4 @@ class ILamp
 };
 
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ILAMP_H_ */
+#endif /* _SRC_OUTPUT_ILAMP_H_ */
diff --git a/FlippR-Driver/src/output/IOutputDriver.h b/FlippR-Driver/src/output/IOutputDriver.h
index 0adb083..caf50db 100644
--- a/FlippR-Driver/src/output/IOutputDriver.h
+++ b/FlippR-Driver/src/output/IOutputDriver.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_
+#ifndef _SRC_OUTPUT_IOUTPUTDRIVER_H_
+#define _SRC_OUTPUT_IOUTPUTDRIVER_H_
 
 namespace output {
 
@@ -18,4 +18,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_IOUTPUTDRIVER_H_ */
+#endif /* _SRC_OUTPUT_IOUTPUTDRIVER_H_ */
diff --git a/FlippR-Driver/src/output/ISolenoid.h b/FlippR-Driver/src/output/ISolenoid.h
index b2e8556..dbae012 100644
--- a/FlippR-Driver/src/output/ISolenoid.h
+++ b/FlippR-Driver/src/output/ISolenoid.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_
+#ifndef _SRC_OUTPUT_ISOLENOID_H_
+#define _SRC_OUTPUT_ISOLENOID_H_
 
 class ISolenoid
 {
@@ -15,4 +15,4 @@ class ISolenoid
 
 
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ISOLENOID_H_ */
+#endif /* _SRC_OUTPUT_ISOLENOID_H_ */
diff --git a/FlippR-Driver/src/output/ISound.h b/FlippR-Driver/src/output/ISound.h
index e7fec70..fa8ac60 100644
--- a/FlippR-Driver/src/output/ISound.h
+++ b/FlippR-Driver/src/output/ISound.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_
+#ifndef _SRC_OUTPUT_ISOUND_H_
+#define _SRC_OUTPUT_ISOUND_H_
 
 namespace output {
 
@@ -20,4 +20,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_ISOUND_H_ */
+#endif /* _SRC_OUTPUT_ISOUND_H_ */
diff --git a/FlippR-Driver/src/output/Lamp.h b/FlippR-Driver/src/output/Lamp.h
index 26d98fa..d3cb2dd 100644
--- a/FlippR-Driver/src/output/Lamp.h
+++ b/FlippR-Driver/src/output/Lamp.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_
+#ifndef _SRC_OUTPUT_LAMP_H_
+#define _SRC_OUTPUT_LAMP_H_
 
 #include "CabinetItem.h"
 
@@ -20,4 +20,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_LAMP_H_ */
+#endif /* _SRC_OUTPUT_LAMP_H_ */
diff --git a/FlippR-Driver/src/output/OutputDriver.h b/FlippR-Driver/src/output/OutputDriver.h
index 17d3c3a..7a87704 100644
--- a/FlippR-Driver/src/output/OutputDriver.h
+++ b/FlippR-Driver/src/output/OutputDriver.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_
+#ifndef _SRC_OUTPUT_OUTPUTDRIVER_H_
+#define _SRC_OUTPUT_OUTPUTDRIVER_H_
 
 #include "IOutputDriver.h"
 
@@ -20,4 +20,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_OUTPUTDRIVER_H_ */
+#endif /* _SRC_OUTPUT_OUTPUTDRIVER_H_ */
diff --git a/FlippR-Driver/src/output/Solenoid.h b/FlippR-Driver/src/output/Solenoid.h
index a899f98..bb7bc10 100644
--- a/FlippR-Driver/src/output/Solenoid.h
+++ b/FlippR-Driver/src/output/Solenoid.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_
+#ifndef _SRC_OUTPUT_SOLENOID_H_
+#define _SRC_OUTPUT_SOLENOID_H_
 
 #include "CabinetItem.h"
 
@@ -20,4 +20,4 @@ public:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_SOLENOID_H_ */
+#endif /* _SRC_OUTPUT_SOLENOID_H_ */
diff --git a/FlippR-Driver/src/output/Sound.h b/FlippR-Driver/src/output/Sound.h
index 87fe1de..04f3ebc 100644
--- a/FlippR-Driver/src/output/Sound.h
+++ b/FlippR-Driver/src/output/Sound.h
@@ -5,8 +5,8 @@
  *      Author: rhetenor
  */
 
-#ifndef SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_
-#define SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_
+#ifndef _SRC_OUTPUT_SOUND_H_
+#define _SRC_OUTPUT_SOUND_H_
 
 #include "ISound.h"
 
@@ -27,4 +27,4 @@ private:
 
 } /* namespace output */
 
-#endif /* SOURCE_DIRECTORY__SRC_OUTPUT_SOUND_H_ */
+#endif /* _SRC_OUTPUT_SOUND_H_ */
diff --git a/FlippR-Driver/tests/output/TestInputDriverFactory.cpp b/FlippR-Driver/tests/output/TestInputDriverFactory.cpp
deleted file mode 100644
index f6f8f42..0000000
--- a/FlippR-Driver/tests/output/TestInputDriverFactory.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * TestInputDriverFactory.cpp
- *
- *  Created on: Jul 11, 2018
- *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Oliver Martin, Dr. Franca Rupprecht
- */
-
-#include "catch.hpp"
-#include "fakeit.hpp"
-
-#include "utilities/LoggerFactory.hpp"
-
-
-// testing purposes
-#define private public
-
-#include "output/Solenoid.h"
-
-using namespace Output;
-using namespace fakeit;
-
-SCENARIO("")
-{
-
-}