diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1ac2fe..6da54f9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,10 @@ add_subdirectory(src/)
 # add ext/ subfolder
 add_subdirectory(ext/)
 
-add_executable(${PROJECT_NAME}
-        main.cpp)
+add_executable(${PROJECT_NAME})
 
+target_sources(${PROJECT_NAME}
+    PRIVATE main.cpp)
 
 target_link_libraries(${PROJECT_NAME} 
     PRIVATE  myxmr)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e41c47..f442b80 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,13 +19,10 @@ set(SOURCE_FILES
         utils.cpp
         RandomOutputs.cpp)
 
+add_library(myxmr STATIC)
 
-# make static library called libmyxrm
-# that we are going to link to
-# in the root CMakeLists.txt file
-add_library(myxmr
-		STATIC
-		${SOURCE_FILES})
+target_sources(myxmr
+    PRIVATE ${SOURCE_FILES})
 
 target_link_libraries(myxmr 
     PUBLIC
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1ff9b96..270faa7 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,10 @@
 macro(add_om_test _TEST_NAME)
 
-    add_executable(${_TEST_NAME}_tests
-            ${_TEST_NAME}_tests.cpp
+    add_executable(${_TEST_NAME}_tests)
+
+    target_sources(${_TEST_NAME}_tests
+            PRIVATE 
+            "${_TEST_NAME}_tests.cpp"
             JsonTx.cpp)
 
     target_link_libraries(${_TEST_NAME}_tests
@@ -15,14 +18,6 @@ macro(add_om_test _TEST_NAME)
 endmacro()
 
 
-include(CodeCoverage)
-APPEND_COVERAGE_COMPILER_FLAGS()
-set(COVERAGE_EXCLUDES
-        '${CMAKE_SOURCE_DIR}/ext/*'
-        'asio/*'
-        '${MONERO_SOURCE_DIR}/*'
-        '${CMAKE_SOURCE_DIR}/tests/*')
-
 resource_dir("res")
 
 add_om_test(mysql)
@@ -37,7 +32,7 @@ add_om_test(txsearch)
 
 include(CodeCoverage)
 
-#APPEND_COVERAGE_COMPILER_FLAGS()
+APPEND_COVERAGE_COMPILER_FLAGS()
 
 set(COVERAGE_LCOV_EXCLUDES
     '*/ext/*' '*boost/*' '*c++/*'