diff --git a/test/test_meshpacket_serializer/test_helpers.h b/test/test_meshpacket_serializer/test_helpers.h
index 2381450b8..630e059bc 100644
--- a/test/test_meshpacket_serializer/test_helpers.h
+++ b/test/test_meshpacket_serializer/test_helpers.h
@@ -15,9 +15,9 @@ static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const u
 {
     meshtastic_MeshPacket packet = meshtastic_MeshPacket_init_zero;
 
-    packet.id = 12345;
-    packet.from = 0xAABBCCDD;
-    packet.to = 0xFFFFFFFF;
+    packet.id = 0x9999;
+    packet.from = 0x11223344;
+    packet.to = 0x55667788;
     packet.channel = 0;
     packet.hop_limit = 3;
     packet.want_ack = false;
@@ -34,8 +34,8 @@ static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const u
     memcpy(packet.decoded.payload.bytes, payload, payload_size);
     packet.decoded.payload.size = payload_size;
     packet.decoded.want_response = false;
-    packet.decoded.dest = 0xFFFFFFFF;
-    packet.decoded.source = 0xAABBCCDD;
+    packet.decoded.dest = 0x55667788;
+    packet.decoded.source = 0x11223344;
     packet.decoded.request_id = 0;
     packet.decoded.reply_id = 0;
     packet.decoded.emoji = 0;
diff --git a/test/test_meshpacket_serializer/test_serializer.cpp b/test/test_meshpacket_serializer/test_serializer.cpp
index d78439c2c..d74031fa4 100644
--- a/test/test_meshpacket_serializer/test_serializer.cpp
+++ b/test/test_meshpacket_serializer/test_serializer.cpp
@@ -1,13 +1,19 @@
+#include "test_helpers.h"
 #include <Arduino.h>
 #include <unity.h>
 
-// Include all modular test files
-#include "ports/test_encrypted.cpp"
-#include "ports/test_nodeinfo.cpp"
-#include "ports/test_position.cpp"
-#include "ports/test_telemetry.cpp"
-#include "ports/test_text_message.cpp"
-#include "ports/test_waypoint.cpp"
+// Forward declarations for test functions
+void test_text_message_serialization();
+void test_position_serialization();
+void test_nodeinfo_serialization();
+void test_waypoint_serialization();
+void test_telemetry_device_metrics_serialization();
+void test_telemetry_environment_metrics_serialization();
+void test_telemetry_environment_metrics_comprehensive();
+void test_telemetry_environment_metrics_missing_fields();
+void test_telemetry_environment_metrics_complete_coverage();
+void test_telemetry_environment_metrics_unset_fields();
+void test_encrypted_packet_serialization();
 
 void setup()
 {