diff --git a/core-writer/CMakeLists.txt b/core-writer/CMakeLists.txt
index e30780e..45a8b53 100644
--- a/core-writer/CMakeLists.txt
+++ b/core-writer/CMakeLists.txt
@@ -3,7 +3,7 @@ file(GLOB SOURCES
         src/compression/*.cpp
         src/compression/*.c)
 
-add_library(core-writer ${SOURCES})
+add_library(core-writer STATIC ${SOURCES})
 include_directories(core-writer external/)
 
 target_include_directories(core-writer PUBLIC
@@ -14,5 +14,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_definitions(core-writer PRIVATE DEBUG_OUTPUT)
 endif()
 
-
-
+enable_testing()
+add_subdirectory(test/)
+add_test(core-writer_tests core-writer_tests)
\ No newline at end of file
diff --git a/core-writer/test/CMakeLists.txt b/core-writer/test/CMakeLists.txt
new file mode 100644
index 0000000..0dd7ed9
--- /dev/null
+++ b/core-writer/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_executable(core-writer_tests test_main.cpp)
+
+target_link_libraries(core-writer_tests
+        core-writer
+        gtest
+        zmq
+        hdf5
+        hdf5_hl
+        hdf5_cpp)
\ No newline at end of file