diff --git a/.gitignore b/.gitignore
index b3632c1..6bf394a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,4 @@ cfimdlp.cpp
 **/.idea/*
 cmake-build-debug
 cmake-build-debug/**
+**/lcoverage/**
diff --git a/Makefile b/Makefile
index 342dcba..a8549f7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ clean: ## Clean up
 test:
 	cd fimdlp/testcpp && ./test
 
+coverage:
+	cd fimdlp/testcpp && ./cover
+
 lint:  ## Lint and static-check
 	black fimdlp
 	flake8 fimdlp
diff --git a/fimdlp/cppfimdlp.cpython-310-darwin.so b/fimdlp/cppfimdlp.cpython-310-darwin.so
index 2ec680b..679347e 100755
Binary files a/fimdlp/cppfimdlp.cpython-310-darwin.so and b/fimdlp/cppfimdlp.cpython-310-darwin.so differ
diff --git a/fimdlp/testcpp/CMakeLists.txt b/fimdlp/testcpp/CMakeLists.txt
index 87b9741..301b926 100644
--- a/fimdlp/testcpp/CMakeLists.txt
+++ b/fimdlp/testcpp/CMakeLists.txt
@@ -3,20 +3,10 @@ project(FImdlp)
 
 # GoogleTest requires at least C++14
 set(CMAKE_CXX_STANDARD 14)
-
 include(FetchContent)
-include_directories(
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googletest
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googletest/include
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googletest/src
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googletest/test/
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googlemock
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googlemock/include
-        /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/build/_deps/googletest-src/googlemock/test
-        /Library/Frameworks/Python.framework/Versions/Current/
-)
-#include_directories(/Users/rmontanana/Code/FImdlp/fimdlp/testcpp/googletest-release-1.12.1/googletest/include /Users/rmontanana/Code/FImdlp/fimdlp/testcpp/googletest-release-1.12.1/googletest)
+
+include_directories(${GTEST_INCLUDE_DIRS})
+
 FetchContent_Declare(
   googletest
   URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
@@ -31,8 +21,13 @@ add_executable(Metrics_unittest ../Metrics.cpp Metrics_unittest.cc)
 add_executable(FImdlp_unittest ../CPPFImdlp.cpp ../Metrics.cpp FImdlp_unittest.cc)
 target_link_libraries(Metrics_unittest GTest::gtest_main)
 target_link_libraries(FImdlp_unittest GTest::gtest_main)
-
+target_compile_options(Metrics_unittest PRIVATE --coverage)
+target_compile_options(FImdlp_unittest PRIVATE --coverage)
+target_link_options(Metrics_unittest PRIVATE --coverage)
+target_link_options(FImdlp_unittest PRIVATE --coverage)
+# -fprofile-arcs -ftest-coverage
 
 include(GoogleTest)
 gtest_discover_tests(Metrics_unittest)
 gtest_discover_tests(FImdlp_unittest)
+
diff --git a/fimdlp/testcpp/cover b/fimdlp/testcpp/cover
new file mode 100755
index 0000000..3f2aca6
--- /dev/null
+++ b/fimdlp/testcpp/cover
@@ -0,0 +1,4 @@
+rm -fr lcoverage/*
+lcov --capture --directory ./ --output-file lcoverage/main_coverage.info
+genhtml lcoverage/main_coverage.info --output-directory lcoverage
+open lcoverage/index.html