diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e62cbf..3a83174 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ if(ENABLE_CODE_COVERAGE)
 endif()
 
 # Required libraries
+find_package(Boost 1.71.0 COMPONENTS unit_test_framework REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(OpenSSL REQUIRED)
 if(NOT OPENSSL_FOUND)
@@ -63,14 +64,13 @@ if(NOT CURL_FOUND)
 endif()
 include_directories(${CURL_INCLUDE_DIRS})
 
-find_library(cpprest REQUIRED)
-include_directories(${CPP_REST_INCLUDE_DIR})
-
-
 include_directories(
   ${PROJECT_SOURCE_DIR}/src
   ${PROJECT_SOURCE_DIR}/third
 )
 
+# Enable CTest
+enable_testing()
+
 add_subdirectory(src)
-#add_subdirectory(test)
+add_subdirectory(test)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 663f71f..4f96f35 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,9 +2,4 @@ add_subdirectory(cocoatweet)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 add_executable(${PROJECT_NAME} main.cc)
-target_link_libraries(${PROJECT_NAME}
-  lib-cocoatweet
-  OpenSSL::SSL
-  OpenSSL::Crypto
-  ${CURL_LIBRARIES}
-)
+target_link_libraries(${PROJECT_NAME} lib-cocoatweet)
\ No newline at end of file
diff --git a/src/cocoatweet/CMakeLists.txt b/src/cocoatweet/CMakeLists.txt
index c5bb89d..ef17d9c 100644
--- a/src/cocoatweet/CMakeLists.txt
+++ b/src/cocoatweet/CMakeLists.txt
@@ -1,4 +1,11 @@
 file(GLOB_RECURSE SOURCES ./*.cc)
 add_library(lib-cocoatweet ${SOURCES})
+target_link_libraries(lib-cocoatweet PUBLIC
+  Boost::boost
+  OpenSSL::SSL
+  OpenSSL::Crypto
+  ${CURL_LIBRARIES}
+)
+
 target_include_directories(lib-cocoatweet PUBLIC ${PROJECT_SOURCE_DIR}/src)
 set_target_properties(lib-cocoatweet PROPERTIES OUTPUT_NAME cocoatweet)