diff --git a/core-buffer/test/test_FastH5Writer.cpp b/core-buffer/test/test_FastH5Writer.cpp
index 581b8a0..ff30671 100644
--- a/core-buffer/test/test_FastH5Writer.cpp
+++ b/core-buffer/test/test_FastH5Writer.cpp
@@ -1,6 +1,8 @@
 #include "FastH5Writer.hpp"
 #include "gtest/gtest.h"
 
+using namespace core_buffer;
+
 TEST(FastH5Writer, basic_interaction)
 {
     auto root_folder = ".";
@@ -16,7 +18,7 @@ TEST(FastH5Writer, basic_interaction)
     metadata.n_recv_packets = 128;
 
     FastH5Writer writer(
-            BufferUtils::FILE_MOD, 512, 1024, device_name, root_folder);
+            core_buffer::FILE_MOD, 512, 1024, device_name, root_folder);
 
     writer.add_scalar_metadata<uint64_t>("pulse_id");
     writer.add_scalar_metadata<uint64_t>("frame_id");
@@ -99,7 +101,7 @@ TEST(FastH5Writer, SWMR)
     }
 
     FastH5Writer writer(
-            BufferUtils::FILE_MOD, 512, 1024, device_name, root_folder);
+            FILE_MOD, MODULE_Y_SIZE, MODULE_X_SIZE, device_name, root_folder);
     writer.add_scalar_metadata<uint64_t>("pulse_id");
     writer.set_pulse_id(0);
 
diff --git a/core-buffer/test/test_buffer_utils.cpp b/core-buffer/test/test_buffer_utils.cpp
index 3b23b6e..a0a7df1 100644
--- a/core-buffer/test/test_buffer_utils.cpp
+++ b/core-buffer/test/test_buffer_utils.cpp
@@ -1,12 +1,13 @@
 #include "gtest/gtest.h"
 #include "BufferUtils.hpp"
+#include "buffer_config.hpp"
 
 using namespace std;
 
 TEST(BufferUtils, get_filename)
 {
     auto expected_file = "/root/device-1/12300000/12345000" +
-            BufferUtils::FILE_EXTENSION;
+            core_buffer::FILE_EXTENSION;
 
     auto root_folder = "/root";
     auto device_name = "device-1";