diff --git a/core-buffer/test/test_FastQueue.cpp b/core-buffer/test/test_FastQueue.cpp
index 3257321..98d351b 100644
--- a/core-buffer/test/test_FastQueue.cpp
+++ b/core-buffer/test/test_FastQueue.cpp
@@ -79,10 +79,10 @@ TEST(FastQueue, data_transfer)
     int write_slot_id = queue.reserve();
 
     auto w_metadata = queue.get_metadata_buffer(write_slot_id);
-    w_metadata->pulse_id = 1;
-    w_metadata->frame_index = 2;
-    w_metadata->daq_rec = 3;
-    w_metadata->n_received_packets = 4;
+    w_metadata->pulse_id[0] = 1;
+    w_metadata->frame_index[0] = 2;
+    w_metadata->daq_rec[0] = 3;
+    w_metadata->n_received_packets[0] = 4;
 
     auto w_data = (uint16_t*)(queue.get_data_buffer(write_slot_id));
     for (size_t i=0; i<MODULE_N_PIXELS; i++) {
@@ -94,10 +94,14 @@ TEST(FastQueue, data_transfer)
     auto read_slot_id = queue.read();
 
     auto r_metadata = queue.get_metadata_buffer(read_slot_id);
-    EXPECT_EQ(w_metadata->pulse_id, r_metadata->pulse_id);
-    EXPECT_EQ(w_metadata->frame_index, r_metadata->frame_index);
-    EXPECT_EQ(w_metadata->daq_rec, r_metadata->daq_rec);
-    EXPECT_EQ(w_metadata->n_received_packets, r_metadata->n_received_packets);
+    EXPECT_EQ(w_metadata->pulse_id[0],
+            r_metadata->pulse_id[0]);
+    EXPECT_EQ(w_metadata->frame_index[0],
+            r_metadata->frame_index[0]);
+    EXPECT_EQ(w_metadata->daq_rec[0],
+            r_metadata->daq_rec[0]);
+    EXPECT_EQ(w_metadata->n_received_packets[0],
+            r_metadata->n_received_packets[0]);
 
     auto r_data = (uint16_t*)(queue.get_data_buffer(read_slot_id));
     for (size_t i=0; i<MODULE_N_PIXELS; i++) {
diff --git a/core-buffer/test/test_UdpReceiver.cpp b/core-buffer/test/test_UdpReceiver.cpp
index e193437..560c391 100644
--- a/core-buffer/test/test_UdpReceiver.cpp
+++ b/core-buffer/test/test_UdpReceiver.cpp
@@ -48,7 +48,7 @@ TEST(UdpReceiver, simple_recv)
     ASSERT_FALSE(udp_receiver.receive(
             &recv_udp_buffer, JUNGFRAU_BYTES_PER_PACKET));
 
-    udp_receiver.close();
+    udp_receiver.disconnect();
     ::close(send_socket_fd);
 }
 
@@ -100,7 +100,7 @@ TEST(UdpReceiver, false_recv)
     ASSERT_TRUE(udp_receiver.receive(
             &recv_udp_buffer, JUNGFRAU_BYTES_PER_PACKET-1));
 
-    udp_receiver.close();
+    udp_receiver.disconnect();
     ::close(send_socket_fd);
 }
 
@@ -165,6 +165,6 @@ TEST(UdpReceiver, receive_many)
     n_msgs = udp_receiver.receive_many(msgs, JUNGFRAU_N_PACKETS_PER_FRAME);
     ASSERT_EQ(n_msgs, -1);
 
-    udp_receiver.close();
+    udp_receiver.disconnect();
     ::close(send_socket_fd);
 }
\ No newline at end of file