diff --git a/test/ErrorHandler.cpp b/test/ErrorHandler.cpp
index 23eaa2aef869e2501b7b74ea56157db7255e6503..e6d4003bc89d40ef363d1a24465e739abd2b7740 100644
--- a/test/ErrorHandler.cpp
+++ b/test/ErrorHandler.cpp
@@ -15,13 +15,13 @@ TEST_CASE("Error: Failed Acceptance", "[errors]") {
 	CHECK(report.packetType == Message::TM);
 	REQUIRE(report.dataSize == 6);
 
-	CHECK(report.readBits(3) == ECSS_PUS_VERSION);
+	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == true);
+	CHECK(report.readBits(1) == false);
 	CHECK(report.readBits(11) == 47);
-	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
+	CHECK(report.readBits(2) == 0);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
-	CHECK(report.readEnum16() == 1);
+	CHECK(report.readEnum16() == 0);
 }
 
 TEST_CASE("Error: Failed Execution Completion", "[errors]") {
@@ -37,11 +37,11 @@ TEST_CASE("Error: Failed Execution Completion", "[errors]") {
 	CHECK(report.packetType == Message::TM);
 	REQUIRE(report.dataSize == 6);
 
-	CHECK(report.readBits(3) == ECSS_PUS_VERSION);
+	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == true);
+	CHECK(report.readBits(1) == false);
 	CHECK(report.readBits(11) == 56);
-	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
+	CHECK(report.readBits(2) == 0);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
 	CHECK(report.readEnum16() == 0);
 }
@@ -59,11 +59,11 @@ TEST_CASE("Error: Failed Routing", "[errors]") {
 	CHECK(report.packetType == Message::TM);
 	REQUIRE(report.dataSize == 6);
 
-	CHECK(report.readBits(3) == ECSS_PUS_VERSION);
+	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == true);
+	CHECK(report.readBits(1) == false);
 	CHECK(report.readBits(11) == 71);
-	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
+	CHECK(report.readBits(2) == 0);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
 	CHECK(report.readEnum16() == 0);
 }