diff --git a/src/fsfw/tmtcpacket/SpacePacketCreator.cpp b/src/fsfw/tmtcpacket/SpacePacketCreator.cpp
index 0263dad3..b02bae80 100644
--- a/src/fsfw/tmtcpacket/SpacePacketCreator.cpp
+++ b/src/fsfw/tmtcpacket/SpacePacketCreator.cpp
@@ -29,9 +29,9 @@ SpacePacketCreator::SpacePacketCreator(ccsds::PacketType packetType, bool secHea
   dataLen = dataLen_;
 }
 
-uint16_t SpacePacketCreator::getPacketId() const { return 0; }
-uint16_t SpacePacketCreator::getPacketSeqCtrl() const { return 0; }
-uint16_t SpacePacketCreator::getPacketDataLen() const { return 0; }
+uint16_t SpacePacketCreator::getPacketId() const { return packetId; }
+uint16_t SpacePacketCreator::getPacketSeqCtrl() const { return packetSeqCtrl; }
+uint16_t SpacePacketCreator::getPacketDataLen() const { return dataLen; }
 
 ReturnValue_t SpacePacketCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize,
                                             SerializeIF::Endianness streamEndianness) const {
diff --git a/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp b/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
index 0fd2a19c..0925cdc7 100644
--- a/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
+++ b/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
@@ -14,7 +14,13 @@ TEST_CASE("CCSDS Test", "[ccsds]") {
 
   SECTION("Header Creator Tests") {
     SpacePacketCreator base = SpacePacketCreator(
-        ccsds::PacketType::TM, true, 0x22,
-        ccsds::SequenceFlags::CONTINUATION, 12, 0x42);
+        ccsds::PacketType::TC, true, 0x02,
+        ccsds::SequenceFlags::FIRST_SEGMENT,  0x34, 0x16);
+    REQUIRE(base.getApid() == 0x02);
+    REQUIRE(base.getSequenceFlags() == ccsds::SequenceFlags::FIRST_SEGMENT);
+    REQUIRE(base.getVersion() == 0b000);
+    REQUIRE(base.getSequenceCount() == 0x34);
+    REQUIRE(base.getPacketDataLen() == 0x16);
+    REQUIRE(base.getPacketType() == ccsds::PacketType::TC);
   }
 }