diff --git a/include/aare/RawFile.hpp b/include/aare/RawFile.hpp
index 0209733..aa75d5c 100644
--- a/include/aare/RawFile.hpp
+++ b/include/aare/RawFile.hpp
@@ -35,7 +35,6 @@ class RawFile : public FileInterface {
 
     RawMasterFile m_master;
     size_t m_current_frame{};
-    size_t m_current_subfile{};
 
     DetectorGeometry m_geometry;
 
diff --git a/include/aare/RawMasterFile.hpp b/include/aare/RawMasterFile.hpp
index 7a2af6f..57189f7 100644
--- a/include/aare/RawMasterFile.hpp
+++ b/include/aare/RawMasterFile.hpp
@@ -78,7 +78,6 @@ class RawMasterFile {
     size_t m_pixels_y{};
     size_t m_pixels_x{};
     size_t m_bitdepth{};
-    size_t m_num_udp_interfaces_per_module = 1;
     uint8_t m_quad = 0;
 
     xy m_geometry{};
diff --git a/tests/test_macros.hpp b/tests/test_macros.hpp
index 4e89923..0d9f59d 100644
--- a/tests/test_macros.hpp
+++ b/tests/test_macros.hpp
@@ -8,7 +8,7 @@
                           test_tags_str)                                       \
     namespace namespace_name {                                                 \
     void test_name##_impl();                                                   \
-    namespace {                                                                \
+                                                                               \
     struct test_name##_Invoker : Catch::ITestInvoker {                         \
         void invoke() const override { test_name##_impl(); }                   \
     };                                                                         \
@@ -16,5 +16,5 @@
         autoReg_##test_name(Catch::Detail::make_unique<test_name##_Invoker>(), \
                             Catch::SourceLineInfo(__FILE__, __LINE__), "",     \
                             Catch::NameAndTags{test_name_str, test_tags_str}); \
-    }                                                                          \
+                                                                               \
     void test_name##_impl()