diff --git a/scripts/coverage.py b/scripts/coverage.py
index 71b6fb03..b5bd7745 100755
--- a/scripts/coverage.py
+++ b/scripts/coverage.py
@@ -6,6 +6,7 @@ import platform
 import sys
 import time
 import argparse
+import webbrowser
 from typing import List
 
 
@@ -18,6 +19,10 @@ information how to set up the build folder.
 def main():
 
     parser = argparse.ArgumentParser(description="Processing arguments for LCOV helper script.")
+    parser.add_argument(
+        '-o', '--open', action='store_true', help='Open coverage data in webbrowser'
+    )
+    args = parser.parse_args()
 
     build_dir_list = []
     if not os.path.isfile('README.md'):
@@ -41,6 +46,8 @@ def main():
         print("Multiple build directories found!")
         build_directory = determine_build_dir(build_dir_list)
     perform_lcov_operation(build_directory)
+    if os.path.isdir('fsfw-tests_coverage') and args.open:
+        webbrowser.open('fsfw-tests_coverage/index.html')
 
 
 def check_for_cmake_build_dir(build_dir_dict: list):
diff --git a/scripts/gen-unittest.sh b/scripts/gen-unittest.sh
new file mode 100755
index 00000000..9ca8c399
--- /dev/null
+++ b/scripts/gen-unittest.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir build-Unittest && cd build-Unittest
+cmake -DFSFW_BUILD_UNITTESTS=ON -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug ..
diff --git a/src/fsfw/tmtcpacket/SpacePacket.h b/src/fsfw/tmtcpacket/SpacePacket.h
index 16673319..a092712c 100644
--- a/src/fsfw/tmtcpacket/SpacePacket.h
+++ b/src/fsfw/tmtcpacket/SpacePacket.h
@@ -73,7 +73,7 @@ namespace spacepacket {
 
 constexpr uint16_t getSpacePacketIdFromApid(bool isTc, uint16_t apid,
         bool secondaryHeaderFlag = true) {
-    return (((isTc << 5) & 0x10) | ((secondaryHeaderFlag << 4) & 0x08) |
+    return ((isTc << 4) | (secondaryHeaderFlag << 3) |
             ((apid >> 8) & 0x07)) << 8 | (apid & 0x00ff);
 }
 
diff --git a/tests/src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt b/tests/src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt
index 36838b24..958bda40 100644
--- a/tests/src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt
+++ b/tests/src/fsfw_tests/unit/tmtcpacket/CMakeLists.txt
@@ -1,3 +1,3 @@
 target_sources(${FSFW_TEST_TGT} PRIVATE
-	PusTmTest.cpp
+	testCcsds.cpp
 )
diff --git a/tests/src/fsfw_tests/unit/tmtcpacket/PusTmTest.cpp b/tests/src/fsfw_tests/unit/tmtcpacket/PusTmTest.cpp
deleted file mode 100644
index b28b04f6..00000000
--- a/tests/src/fsfw_tests/unit/tmtcpacket/PusTmTest.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp b/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
new file mode 100644
index 00000000..8f531805
--- /dev/null
+++ b/tests/src/fsfw_tests/unit/tmtcpacket/testCcsds.cpp
@@ -0,0 +1,11 @@
+#include <catch2/catch_test_macros.hpp>
+
+#include "fsfw/tmtcpacket/SpacePacket.h"
+
+TEST_CASE( "CCSDS Test" , "[ccsds]") {
+    REQUIRE(spacepacket::getTcSpacePacketIdFromApid(0x22) == 0x1822);
+    REQUIRE(spacepacket::getTmSpacePacketIdFromApid(0x22) == 0x0822);
+
+    REQUIRE(spacepacket::getTcSpacePacketIdFromApid(0x7ff) == 0x1fff);
+    REQUIRE(spacepacket::getTmSpacePacketIdFromApid(0x7ff) == 0xfff);
+}
diff --git a/tests/user/testcfg/CMakeLists.txt b/tests/user/testcfg/CMakeLists.txt
new file mode 100644
index 00000000..46808ec4
--- /dev/null
+++ b/tests/user/testcfg/CMakeLists.txt
@@ -0,0 +1,9 @@
+target_sources(${TARGET_NAME} PRIVATE
+    ipc/MissionMessageTypes.cpp
+    pollingsequence/PollingSequenceFactory.cpp
+)
+
+# Add include paths for the executable
+target_include_directories(${TARGET_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
\ No newline at end of file