diff --git a/FlippR-Driver/src/input/EventHandler.cpp b/FlippR-Driver/src/input/EventHandler.cpp
index 8ccb160..e9706d6 100644
--- a/FlippR-Driver/src/input/EventHandler.cpp
+++ b/FlippR-Driver/src/input/EventHandler.cpp
@@ -6,10 +6,11 @@
  */
 #include "EventHandler.h"
 
-using namespace Input;
+namespace Input
+{
 
   EventHandler::EventHandler(std::shared_ptr<IInputDriver> input_driver) :
-  input_driver(input_driver)
+      input_driver(input_driver)
   {
     this->input_driver->register_event_handler(this);
 
@@ -28,4 +29,4 @@ using namespace Input;
     CLOG(WARNING, INPUT_LOGGER) << "Called EventHandler parent class";
   }
 
-
+}
diff --git a/FlippR-Driver/tests/input/TestEventHandler.cpp b/FlippR-Driver/tests/input/TestEventHandler.cpp
new file mode 100644
index 0000000..4977c50
--- /dev/null
+++ b/FlippR-Driver/tests/input/TestEventHandler.cpp
@@ -0,0 +1,7 @@
+/*
+ * TestEventHandler.cpp
+ *
+ *  Created on: Jun 28, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+