diff --git a/CMakeLists.txt b/CMakeLists.txt
index e59eb4c5..949c9403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ if(FSFW_BUILD_TESTS)
   configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h)
 
   project(${FSFW_TEST_TGT} CXX C)
-  add_executable(${FSFW_TEST_TGT})
+  add_executable(${FSFW_TEST_TGT} unittests/serialize/testSerializeIF.cpp)
   if(IPO_SUPPORTED AND FSFW_ENABLE_IPO)
     set_property(TARGET ${FSFW_TEST_TGT} PROPERTY INTERPROCEDURAL_OPTIMIZATION
                                                   TRUE)
diff --git a/unittests/serialize/CMakeLists.txt b/unittests/serialize/CMakeLists.txt
index 96c80f4a..be4301db 100644
--- a/unittests/serialize/CMakeLists.txt
+++ b/unittests/serialize/CMakeLists.txt
@@ -1,5 +1,6 @@
 target_sources(${FSFW_TEST_TGT} PRIVATE
-	TestSerialBufferAdapter.cpp
-	TestSerialization.cpp
-	TestSerialLinkedPacket.cpp
+	testSerialBufferAdapter.cpp
+  testSerializeAdapter.cpp
+	testSerialLinkedPacket.cpp
+	testSerializeIF.cpp
 )
diff --git a/unittests/serialize/TestSerialLinkedPacket.h b/unittests/serialize/SerialLinkedListAdapterPacket.h
similarity index 80%
rename from unittests/serialize/TestSerialLinkedPacket.h
rename to unittests/serialize/SerialLinkedListAdapterPacket.h
index 0cfdd9ff..81268d28 100644
--- a/unittests/serialize/TestSerialLinkedPacket.h
+++ b/unittests/serialize/SerialLinkedListAdapterPacket.h
@@ -26,13 +26,13 @@ class TestPacket : public SerialLinkedListAdapter<SerializeIF> {
     setLinks();
   }
 
-  uint32_t getHeader() const { return header.entry; }
+  [[nodiscard]] uint32_t getHeader() const { return header.entry; }
 
-  const uint8_t* getBuffer() { return buffer.entry.getConstBuffer(); }
+  [[nodiscard]] const uint8_t* getBuffer() const { return buffer.entry.getConstBuffer(); }
 
   size_t getBufferLength() { return buffer.getSerializedSize(); }
 
-  uint16_t getTail() const { return tail.entry; }
+  [[nodiscard]] uint16_t getTail() const { return tail.entry; }
 
  private:
   void setLinks() {
@@ -47,4 +47,4 @@ class TestPacket : public SerialLinkedListAdapter<SerializeIF> {
   SerializeElement<uint32_t> tail = 0;
 };
 
-#endif /* UNITTEST_TESTFW_NEWTESTS_TESTTEMPLATE_H_ */
+#endif /* UNITTEST_HOSTED_TESTSERIALLINKEDPACKET_H_ */
diff --git a/unittests/serialize/TestSerialBufferAdapter.cpp b/unittests/serialize/testSerialBufferAdapter.cpp
similarity index 98%
rename from unittests/serialize/TestSerialBufferAdapter.cpp
rename to unittests/serialize/testSerialBufferAdapter.cpp
index 2aa76ec8..f9fbece1 100644
--- a/unittests/serialize/TestSerialBufferAdapter.cpp
+++ b/unittests/serialize/testSerialBufferAdapter.cpp
@@ -92,7 +92,7 @@ TEST_CASE("Serial Buffer Adapter", "[single-file]") {
     testArray[3] = 1;
     testArray[4] = 1;
     testArray[5] = 0;
-    std::array<uint8_t, 4> test_recv_array;
+    std::array<uint8_t, 4> test_recv_array{};
     arrayPtr = testArray.data();
     // copy testArray[1] to testArray[4] into receive buffer, skip
     // size field (testArray[0]) for deSerialization.
@@ -116,7 +116,7 @@ TEST_CASE("Serial Buffer Adapter", "[single-file]") {
     testArray[3] = 1;
     testArray[4] = 1;
     testArray[5] = 0;
-    std::array<uint8_t, 4> test_recv_array;
+    std::array<uint8_t, 4> test_recv_array{};
     arrayPtr = testArray.data() + 2;
     // copy testArray[1] to testArray[4] into receive buffer, skip
     // size field (testArray[0])
diff --git a/unittests/serialize/TestSerialLinkedPacket.cpp b/unittests/serialize/testSerialLinkedPacket.cpp
similarity index 98%
rename from unittests/serialize/TestSerialLinkedPacket.cpp
rename to unittests/serialize/testSerialLinkedPacket.cpp
index 2d6e476f..40910efb 100644
--- a/unittests/serialize/TestSerialLinkedPacket.cpp
+++ b/unittests/serialize/testSerialLinkedPacket.cpp
@@ -1,11 +1,10 @@
-#include "TestSerialLinkedPacket.h"
-
 #include <fsfw/globalfunctions/arrayprinter.h>
 
 #include <array>
 #include <catch2/catch_test_macros.hpp>
 
 #include "CatchDefinitions.h"
+#include "SerialLinkedListAdapterPacket.h"
 
 TEST_CASE("Serial Linked Packet", "[SerLinkPacket]") {
   // perform set-up here
diff --git a/unittests/serialize/TestSerialization.cpp b/unittests/serialize/testSerializeAdapter.cpp
similarity index 100%
rename from unittests/serialize/TestSerialization.cpp
rename to unittests/serialize/testSerializeAdapter.cpp
diff --git a/unittests/serialize/testSerializeIF.cpp b/unittests/serialize/testSerializeIF.cpp
new file mode 100644
index 00000000..80bcba64
--- /dev/null
+++ b/unittests/serialize/testSerializeIF.cpp
@@ -0,0 +1,6 @@
+
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE("Simple Test", "[SerSizeTest]") {
+  
+}
\ No newline at end of file