diff --git a/CMakeLists.txt b/CMakeLists.txt
index 487497a..c946395 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,8 @@ find_package(up-core-api REQUIRED)
 find_package(up-cpp REQUIRED)
 find_package(zenohcpp REQUIRED)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -fprofile-arcs -ftest-coverage")
+
 # TODO NEEDED?
 #add_definitions(-DSPDLOG_FMT_EXTERNAL)
 
diff --git a/coverage.sh b/coverage.sh
new file mode 100755
index 0000000..0a1d2d0
--- /dev/null
+++ b/coverage.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+echo "Unit Test Coverage report generation.  Must compile and run ctest before running this."
+
+mkdir ./build/Coverage
+
+gcovr -r . --html --html-details -o ./build/Coverage/index.html -e '.*test.*' 
+
+xdg-open ./build/Coverage/index.html
+cd ..
+echo "Coverage report can be found here: ./build/Coverage/index.html"
+
diff --git a/test/coverage/ZenohUTransportTest.cpp b/test/coverage/ZenohUTransportTest.cpp
index 0fd3c65..1bdff1a 100644
--- a/test/coverage/ZenohUTransportTest.cpp
+++ b/test/coverage/ZenohUTransportTest.cpp
@@ -84,8 +84,11 @@ TEST_F(TestZenohUTransport, toZenohKeyString) {
 	EXPECT_TRUE(
 	    (std::is_base_of_v<transport::ZenohUTransport, ExposeKeyString>));
 
-	EXPECT_EQ(
-	    ExposeKeyString::toZenohKeyString(
+	EXPECT_EQ(ExposeKeyString::toZenohKeyString(
+	        "10.23.45.67", create_uuri("", 0x10AB, 3, 0x80CD), std::nullopt),
+	    "up/10.23.45.67/10AB/3/80CD/{}/{}/{}/{}");
+
+	EXPECT_EQ(ExposeKeyString::toZenohKeyString(
 	        "", create_uuri("192.168.1.100", 0x10AB, 3, 0x80CD), std::nullopt),
 	    "up/192.168.1.100/10AB/3/80CD/{}/{}/{}/{}");