diff --git a/FlippR-Driver/build/CMakeLists.txt b/FlippR-Driver/build/CMakeLists.txt
index c4646a2..7b16b4b 100644
--- a/FlippR-Driver/build/CMakeLists.txt
+++ b/FlippR-Driver/build/CMakeLists.txt
@@ -23,3 +23,23 @@ file(GLOB HEADER_SOURCES ${SOURCE_DIR}/*/*.hpp")
 add_library(flippr_driver STATIC ${SOURCES} ${HEADER_SOURCES})
     
 target_link_libraries(flippr_driver ${CMAKE_SOURCE_DIR}/lib/libwiringPi.so.2.44)
+
+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}/*)
+
+# 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)
\ No newline at end of file
diff --git a/FlippR-Driver/json_example/gpio_config.json b/FlippR-Driver/build/bak/json_example/gpio_config.json
similarity index 100%
rename from FlippR-Driver/json_example/gpio_config.json
rename to FlippR-Driver/build/bak/json_example/gpio_config.json
diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.hpp
index 6fec0cd..fd2f05f 100644
--- a/FlippR-Driver/src/input/InputDriver.hpp
+++ b/FlippR-Driver/src/input/InputDriver.hpp
@@ -9,7 +9,7 @@
 
 #include "../utilities/config.h"
 
-#include "EventHandler.h"
+#include "EventHandler.hpp"
 #include "EventNotifier.h"
 #include "Detector.h"