diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4dd167..4acfa81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,7 @@ HunterGate(
 
 project(eedb)
 
-add_definitions( -std=c++1z )
-
+include(cmake/Compiler.cmake)
 include(cmake/FindAllRequirements.cmake)
 
 #hunter_add_package(Boost COMPONENTS system filesystem)
diff --git a/cmake/Compiler.cmake b/cmake/Compiler.cmake
new file mode 100644
index 0000000..d6c597f
--- /dev/null
+++ b/cmake/Compiler.cmake
@@ -0,0 +1 @@
+add_definitions( -std=c++1z )
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 8bb12f4..387161e 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -13,14 +13,13 @@ include_directories( ${gmock_SOURCE_DIR}/include)
 	set(TEST_EXECUTABLE_NAME eedb_test )
 
 	#add test files
-	file(GLOB_RECURSE TEST_FILES *.cpp )
+        file(GLOB_RECURSE TEST_FILES test_*.cpp )
 	INCLUDE_DIRECTORIES(${PostgreSQL_INCLUDE_DIRS})
 	add_executable( ${TEST_EXECUTABLE_NAME} ${TEST_FILES})
 	
-	target_link_libraries( ${TEST_EXECUTABLE_NAME} gmock gtest wt wttest eedb_db auth ${Boost_LIBRARIES}  )
+        target_link_libraries( ${TEST_EXECUTABLE_NAME} GMock::main wt wttest eedb_db auth ${Boost_LIBRARIES}  )
 	
 	add_test( ${TEST_EXECUTABLE_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_EXECUTABLE_NAME})
-
 #endif()
 
 if(enable_benchmarks)