diff --git a/unittests/tmtcpacket/testPusTmCreator.cpp b/unittests/tmtcpacket/testPusTmCreator.cpp
index 99c16550..4561a022 100644
--- a/unittests/tmtcpacket/testPusTmCreator.cpp
+++ b/unittests/tmtcpacket/testPusTmCreator.cpp
@@ -146,4 +146,13 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
               SerializeIF::BUFFER_TOO_SHORT);
     }
   }
+
+  SECTION("No CRC Generation") {
+    creator.disableCrcCalculation();
+    REQUIRE(not creator.crcCalculationEnabled());
+    REQUIRE(creator.serialize(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(serLen == 22);
+    REQUIRE(buf[20] == 0x00);
+    REQUIRE(buf[21] == 0x00);
+  }
 }
\ No newline at end of file
diff --git a/unittests/tmtcpacket/testPusTmReader.cpp b/unittests/tmtcpacket/testPusTmReader.cpp
index 3914db48..7967dba6 100644
--- a/unittests/tmtcpacket/testPusTmReader.cpp
+++ b/unittests/tmtcpacket/testPusTmReader.cpp
@@ -38,9 +38,10 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
       readerPtr->setTimeReader(&timeStamperAndReader);
       deleteReader = true;
     }
-    REQUIRE(readerPtr);
-    REQUIRE(not readerPtr->isNull());
+    REQUIRE(not *readerPtr);
+    REQUIRE(readerPtr->isNull());
     REQUIRE(readerPtr->parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(not readerPtr->isNull());
     REQUIRE(readerPtr->getService() == 17);
     REQUIRE(readerPtr->getSubService() == 2);
     REQUIRE(readerPtr->getApid() == 0xef);