diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f15ae861822932d017ac58c40895a66534ef4e7e..8036b23a853b6dcee2ffd28d08de9c0712cd22a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -263,7 +263,7 @@ test-search-service:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html --omit="test/*,omlib/*" && coverage report --omit="test/*,omlib/*" > ./coverage.txt
+    - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
@@ -287,7 +287,7 @@ test-search-service-init:
   script:
     - "pip install pipenv"
     - "pipenv install gunicorn && pipenv install --dev --system --deploy"
-    - cd ./dbrepo-search-service/ && coverage run -m pytest ./init/test/test_app.py --junitxml=report.xml && coverage html --omit="init/test/*" && coverage report --omit="init/test/*" > ./coverage.txt
+    - cd ./dbrepo-search-service/ && coverage run -m pytest ./init/test/test_app.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
     - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
     when: always
diff --git a/dbrepo-search-service/.coveragerc b/dbrepo-search-service/.coveragerc
new file mode 100644
index 0000000000000000000000000000000000000000..97830be8d6132cc05a9e96bea0f8a7a7bc8f8365
--- /dev/null
+++ b/dbrepo-search-service/.coveragerc
@@ -0,0 +1,4 @@
+[report]
+omit =
+    */test/*
+    */omlib/*
\ No newline at end of file
diff --git a/lib/python/.coveragerc b/lib/python/.coveragerc
new file mode 100644
index 0000000000000000000000000000000000000000..2301243c8400da8046858a8cbfc8a5abfad9b5d7
--- /dev/null
+++ b/lib/python/.coveragerc
@@ -0,0 +1,3 @@
+[report]
+omit =
+    */tests/*
diff --git a/lib/python/.gitignore b/lib/python/.gitignore
index 46916e3e91c948d297fa8fda068bc1b123d9aced..c954a774008e444617bea9ec16df30b7dda3183b 100644
--- a/lib/python/.gitignore
+++ b/lib/python/.gitignore
@@ -5,6 +5,7 @@
 dist/
 dbrepo.egg-info/
 build/
+htmlcov/
 
 # debug
 debug.py
diff --git a/lib/python/test.sh b/lib/python/test.sh
index 532d9a58d1a981cbd070f371ebf6dfaea7757c20..cd0129654a468e4aa0d9bec0b1ba3b04f193fd24 100644
--- a/lib/python/test.sh
+++ b/lib/python/test.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 source ./lib/python/venv/bin/activate
-cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
\ No newline at end of file
+cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
\ No newline at end of file
diff --git a/lib/python/tests/test_unit_container.py b/lib/python/tests/test_unit_container.py
index 94d18b79fdf3953cba79d41a80bda9dd0d5a58a3..0e1d93faa0e9b1c598afcede5ad71c7e08ef9767 100644
--- a/lib/python/tests/test_unit_container.py
+++ b/lib/python/tests/test_unit_container.py
@@ -4,7 +4,7 @@ import requests_mock
 import datetime
 
 from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief
+from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief, DataType
 from dbrepo.api.exceptions import ResponseCodeError, NotExistsError
 
 
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index e7cefa6d5b7e829f2f30dd1befff453d6d40a9de..f72c80c93c0497eb0d2d6f68e2ab8029cccb2aec 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -7,7 +7,7 @@ from pydantic_core import ValidationError
 
 from dbrepo.RestClient import RestClient
 from dbrepo.api.dto import Database, User, Container, Image, UserAttributes, DatabaseAccess, AccessType, DatabaseBrief, \
-    UserBrief
+    UserBrief, DataType
 from dbrepo.api.exceptions import ResponseCodeError, NotExistsError, ForbiddenError, MalformedError, AuthenticationError