diff --git a/std-udp-recv/test/test_FrameUdpReceiver.cpp b/std-udp-recv/test/test_FrameUdpReceiver.cpp
index e22356d..5a9f116 100644
--- a/std-udp-recv/test/test_FrameUdpReceiver.cpp
+++ b/std-udp-recv/test/test_FrameUdpReceiver.cpp
@@ -1,5 +1,4 @@
 #include <netinet/in.h>
-#include <jungfrau.hpp>
 #include "gtest/gtest.h"
 #include "FrameUdpReceiver.hpp"
 #include "mock/udp.hpp"
@@ -10,10 +9,12 @@
 
 using namespace std;
 
+const int DATA_BYTES_PER_FRAME = 512*1024*2;
+
 TEST(BufferUdpReceiver, simple_recv)
 {
-    auto n_packets = N_PACKETS_PER_FRAME;
-    int source_id = 1234;
+    auto n_packets = 128;
+    int module_id = 0;
     int n_frames = 5;
 
     uint16_t udp_port = MOCK_UDP_PORT;
@@ -21,7 +22,7 @@ TEST(BufferUdpReceiver, simple_recv)
     auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
     ASSERT_TRUE(send_socket_fd >= 0);
 
-    FrameUdpReceiver udp_receiver(udp_port, source_id);
+    FrameUdpReceiver udp_receiver(udp_port, n_packets);
 
     auto handle = async(launch::async, [&](){
         for (int i_frame=0; i_frame < n_frames; i_frame++){
@@ -45,19 +46,20 @@ TEST(BufferUdpReceiver, simple_recv)
 
     handle.wait();
 
-    ModuleFrame metadata;
+    ModuleFrame meta;
+    meta.module_id = module_id;
+    meta.bit_depth = 16;
     auto frame_buffer = make_unique<char[]>(DATA_BYTES_PER_FRAME);
 
     for (int i_frame=0; i_frame < n_frames; i_frame++) {
-        auto pulse_id = udp_receiver.get_frame_from_udp(
-                metadata, frame_buffer.get());
+        udp_receiver.get_frame_from_udp(meta, frame_buffer.get());
 
-        ASSERT_EQ(i_frame + 1, pulse_id);
-        ASSERT_EQ(metadata.frame_index, i_frame + 1000);
-        ASSERT_EQ(metadata.daq_rec, i_frame + 10000);
+        ASSERT_EQ(i_frame + 1, meta.pulse_id);
+        ASSERT_EQ(meta.frame_index, i_frame + 1000);
+        ASSERT_EQ(meta.daq_rec, i_frame + 10000);
         // -1 because we skipped a packet.
-        ASSERT_EQ(metadata.n_recv_packets, n_packets);
-        ASSERT_EQ(metadata.module_id, source_id);
+        ASSERT_EQ(meta.n_recv_packets, n_packets);
+        ASSERT_EQ(meta.module_id, module_id);
     }
 
     ::close(send_socket_fd);
@@ -65,7 +67,7 @@ TEST(BufferUdpReceiver, simple_recv)
 
 TEST(BufferUdpReceiver, missing_middle_packet)
 {
-    auto n_packets = N_PACKETS_PER_FRAME;
+    auto n_packets = 128;
     int source_id = 1234;
     int n_frames = 3;
 
@@ -123,7 +125,7 @@ TEST(BufferUdpReceiver, missing_middle_packet)
 
 TEST(BufferUdpReceiver, missing_first_packet)
 {
-    auto n_packets = N_PACKETS_PER_FRAME;
+    auto n_packets = 128;
     int source_id = 1234;
     int n_frames = 3;
 
@@ -181,7 +183,7 @@ TEST(BufferUdpReceiver, missing_first_packet)
 
 TEST(BufferUdpReceiver, missing_last_packet)
 {
-    auto n_packets = N_PACKETS_PER_FRAME;
+    auto n_packets = 128;
     int source_id = 1234;
     int n_frames = 3;