diff --git a/.clang b/.clang
index 8b5eec8..579743b 100644
--- a/.clang
+++ b/.clang
@@ -1 +1 @@
--I ./include -std=c++11
+-I ./include -I ./external/Catch/include/ -std=c++11
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4248d85..5c7fd80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(CONCATENATOR_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
 set(CONCATENATOR_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
-set(CONCATENATOR_TEST_DIR ${PROJECT_SOURCE_DIR}/tests)
+set(CONCATENATOR_TEST_DIR ${PROJECT_SOURCE_DIR}/test)
 
 set(CONCATENATOR_SOURCE_FILES
     ${CONCATENATOR_SOURCE_DIR}/Concatenator.cpp
@@ -42,7 +42,8 @@ set(CONCATENATOR_HEADER_FILES
     ${CONCATENATOR_INCLUDE_DIR}/Logger.h
 )
 set(CONCATENATOR_TEST_SOURCES
-    ${CONCATENATOR_TEST_DIR}/Concatenator_Basic_Tests.cpp
+    ${CONCATENATOR_TEST_DIR}/Concatenator_Test.cpp
+    ${CONCATENATOR_TEST_DIR}/Basic_Tests.cpp
 )
 
 include_directories(${CONCATENATOR_INCLUDE_DIR})
@@ -83,8 +84,8 @@ if(BUILD_TESTS)
     endif()
 
 
-    add_executable(Concatenator_Basic_Tests ${CONCATENATOR_TEST_SOURCES})
-    target_link_libraries(Concatenator_Basic_Tests Catch)
-    add_test(NAME TestBase COMMAND Concatenator_Base_Test)
+    add_executable(Concatenator_Test ${CONCATENATOR_TEST_SOURCES})
+    target_link_libraries(Concatenator_Test Catch)
+    add_test(NAME TestBase COMMAND Concatenator_Test)
 endif()
 
diff --git a/test/Basic_Tests.cpp b/test/Basic_Tests.cpp
new file mode 100644
index 0000000..fc502ef
--- /dev/null
+++ b/test/Basic_Tests.cpp
@@ -0,0 +1 @@
+#include "catch.hpp"
diff --git a/tests/Concatenator_Basic_Tests.cpp b/test/Concatenator_Test.cpp
similarity index 98%
rename from tests/Concatenator_Basic_Tests.cpp
rename to test/Concatenator_Test.cpp
index 3c3c6f2..2926188 100644
--- a/tests/Concatenator_Basic_Tests.cpp
+++ b/test/Concatenator_Test.cpp
@@ -1,2 +1,4 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch.hpp>
+
+
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000