diff --git a/src/ClusterFinderMT.test.cpp b/src/ClusterFinderMT.test.cpp
index 9289592..f4abd58 100644
--- a/src/ClusterFinderMT.test.cpp
+++ b/src/ClusterFinderMT.test.cpp
@@ -58,8 +58,10 @@ class ClusterFinderMTWrapper
 };
 
 TEST_CASE("multithreaded cluster finder", "[.files][.ClusterFinder]") {
-    auto fpath = "/mnt/sls_det_storage/matterhorn_data/aare_test_data/"
-                 "Moench03new/cu_half_speed_master_4.json";
+    auto fpath =
+        test_data_path() / "clust/Moench03new/cu_half_speed_master_4.json";
+
+    REQUIRE(std::filesystem::exists(fpath));
 
     File file(fpath);
 
diff --git a/src/RawFile.cpp b/src/RawFile.cpp
index dc6c907..788d012 100644
--- a/src/RawFile.cpp
+++ b/src/RawFile.cpp
@@ -21,8 +21,8 @@ RawFile::RawFile(const std::filesystem::path &fname, const std::string &mode)
     if (mode == "r") {
         if (m_master.roi()) {
             m_geometry.update_geometry_with_roi(m_master.roi().value());
-            open_subfiles();
         }
+        open_subfiles();
     } else {
         throw std::runtime_error(LOCATION +
                                  " Unsupported mode. Can only read RawFiles.");