diff --git a/core-buffer/test/test_BufferUdpReceiver.cpp b/core-buffer/test/test_BufferUdpReceiver.cpp
index c1e167c..8023dd2 100644
--- a/core-buffer/test/test_BufferUdpReceiver.cpp
+++ b/core-buffer/test/test_BufferUdpReceiver.cpp
@@ -13,33 +13,33 @@ using namespace std;
 TEST(BufferUdpReceiver, simple_recv)
 {
     auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
+    int source_id = 1234;
 
     uint16_t udp_port = MOCK_UDP_PORT;
     auto server_address = get_server_address(udp_port);
     auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
     ASSERT_TRUE(send_socket_fd >= 0);
 
-    BufferUdpReceiver udp_receiver(udp_port, 1);
-    this_thread::sleep_for(chrono::milliseconds(100));
-
-    uint64_t send_pulse_id = 1234567;
+    BufferUdpReceiver udp_receiver(udp_port, source_id);
 
     auto handle = async(launch::async, [&](){
-        for (size_t i_packet=0; i_packet<n_packets; i_packet++) {
+        for (int i_frame=0; i_frame < BUFFER_UDP_RCVBUF_N_SLOTS; i_frame++){
+            for (size_t i_packet=0; i_packet<n_packets; i_packet++) {
 
-            jungfrau_packet send_udp_buffer;
-            send_udp_buffer.packetnum = i_packet;
-            send_udp_buffer.bunchid = send_pulse_id;
-            send_udp_buffer.framenum = i_packet + 1000;
-            send_udp_buffer.debug = i_packet + 100000;
+                jungfrau_packet send_udp_buffer;
+                send_udp_buffer.packetnum = i_packet;
+                send_udp_buffer.bunchid = i_frame;
+                send_udp_buffer.framenum = i_frame + 1000;
+                send_udp_buffer.debug = i_frame + 10000;
 
-            ::sendto(
-                    send_socket_fd,
-                    &send_udp_buffer,
-                    JUNGFRAU_BYTES_PER_PACKET,
-                    0,
-                    (sockaddr*) &server_address,
-                    sizeof(server_address));
+                ::sendto(
+                        send_socket_fd,
+                        &send_udp_buffer,
+                        JUNGFRAU_BYTES_PER_PACKET,
+                        0,
+                        (sockaddr*) &server_address,
+                        sizeof(server_address));
+            }
         }
     });
 
@@ -48,9 +48,15 @@ TEST(BufferUdpReceiver, simple_recv)
     ModuleFrame metadata;
     auto frame_buffer = make_unique<char[]>(JUNGFRAU_DATA_BYTES_PER_FRAME);
 
-    auto pulse_id = udp_receiver.get_frame_from_udp(
-            metadata, frame_buffer.get());
-    ASSERT_EQ(send_pulse_id, pulse_id);
+    for (int i_frame=0; i_frame < BUFFER_UDP_RCVBUF_N_SLOTS; i_frame++) {
+        auto pulse_id = udp_receiver.get_frame_from_udp(
+                metadata, frame_buffer.get());
+        ASSERT_EQ(i_frame, pulse_id);
+        ASSERT_EQ(metadata.frame_index, i_frame + 1000);
+        ASSERT_EQ(metadata.daq_rec, i_frame + 10000);
+        ASSERT_EQ(metadata.n_received_packets, n_packets);
+        ASSERT_EQ(metadata.module_id, source_id);
+    }
 
     ::close(send_socket_fd);
 }