diff --git a/FlippR-Driver/build/CMakeLists.txt b/FlippR-Driver/build/CMakeLists.txt
index 7903515..4b47d61 100644
--- a/FlippR-Driver/build/CMakeLists.txt
+++ b/FlippR-Driver/build/CMakeLists.txt
@@ -8,6 +8,15 @@ set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 set(SOURCE_DIR ../src)
+set(LIB_DIR ${SOURCE_DIR}/lib)
+
+set(EASYLOGGING_INCLUDE_DIR ${LIB_DIR}/easylogging)
+add_library(Easylogging STATIC ${EASYLOGGING_INCLUDE_DIR}/easylogging++.cc)
+include_directories(${EASYLOGGING_INCLUDE_DIR})
+
+add_library(libwiringPi SHARED IMPORTED )
+set_property(TARGET libwiringPi PROPERTY IMPORTED_LOCATION ${LIB_DIR}/libwiringPi.so.2.44)
+set_property(TARGET libwiringPi PROPERTY INTERFACE_INCLUDE_DIRECTORIES /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/lib/wiringPi)
 
 find_package(Threads)
 find_package(Boost)
@@ -17,28 +26,29 @@ include_directories(${SOURCE_DIR}/output)
 include_directories(${SOURCE_DIR}/lib)
 include_directories(${SOURCE_DIR}/utilities)
 
-file(GLOB SOURCES ${SOURCE_DIR}/*/*.cpp)
+file(GLOB SOURCES ${SOURCE_DIR}/*/*.?pp)
 
 add_library(flippr_driver STATIC ${SOURCES})
-    
-target_link_libraries(flippr_driver ${CMAKE_SOURCE_DIR}/lib/libwiringPi.so.2.44)
-
-enable_testing(TRUE)
+   
+target_link_libraries(flippr_driver libwiringPi)
+target_link_libraries(flippr_driver Easylogging)
 
+# enable_testing(TRUE)
+# 
 # Prepare "Catch" library for other executables
-set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests)
-add_library(Catch INTERFACE)
-target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
-
+# set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/tests)
+# add_library(Catch INTERFACE)
+# target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
+# 
 # Make test executable
-set(TEST_SOURCES ${SOURCE_DIR}/../tests/input)
-include_directories(${TEST_SOURCES})
-include_directories(${TEST_SOURCES}/mocks)
-
-file(GLOB SOURCES ${TEST_SOURCES}/*.cpp)
-file(GLOB HEADER_SOURCES ${TEST_SOURCES}/*.hpp)
-
-add_executable(tests ${SOURCES} ${HEADER_SOURCES})
-
-target_link_libraries(flippr_driver)
-target_link_libraries(tests Catch)
+# set(TEST_SOURCES ${SOURCE_DIR}/../tests)
+# include_directories(${TEST_SOURCES})
+# 
+# file(GLOB SOURCES ${TEST_SOURCES}/*/*.cpp)
+# file(GLOB HEADER_SOURCES ${TEST_SOURCES}/*/*.hpp)
+# 
+# add_executable(tests ${SOURCES} ${HEADER_SOURCES})
+# 
+# target_link_libraries(tests Easylogging)
+# target_link_libraries(tests flippr_driver)
+# target_link_libraries(tests Catch)
diff --git a/FlippR-Driver/src/input/main.cpp b/FlippR-Driver/src/input/main.cpp
deleted file mode 100644
index 308ff5b..0000000
--- a/FlippR-Driver/src/input/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <vector>
-#include "Detector.h"
-#include <iostream>
-
-#include "Event.hpp"
-int main()
-{
-  return 0;
-}
diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index 9b54ecb..cb044ac 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -59,18 +59,18 @@ SCENARIO("An EventHandler [un]registers at the driver", "[[un]register]")
 
       THEN("The register_event_handler at the event_notifier gets called")
       {
-        REQUIRE(Verify(Method(event_notifier_mock, register_event_handler).Using(&event_handler_mock.get())));
+        REQUIRE((bool)Verify(Method(event_notifier_mock, register_event_handler).Using(&event_handler_mock.get())));
       }
     }
 
     WHEN("The EventHandler unregisters at the driver")
     {
-      REQUIRE(Verify(Method(event_notifier_mock, register_event_handler).Using(&event_handler_mock.get())));
+      REQUIRE((bool)Verify(Method(event_notifier_mock, register_event_handler).Using(&event_handler_mock.get())));
       input_driver.unregister_event_handler(&event_handler_mock.get());
 
       THEN("The unregister_event_handler at the event_notifier gets called")
       {
-        REQUIRE(Verify(Method(event_notifier_mock, unregister_event_handler).Using(&event_handler_mock.get())));
+        REQUIRE((bool)Verify(Method(event_notifier_mock, unregister_event_handler).Using(&event_handler_mock.get())));
       }
     }
   }