diff --git a/repertory/repertory_test/src/file_manager_open_file_test.cpp b/repertory/repertory_test/src/file_manager_open_file_test.cpp
index f4338ce6..b72c5a10 100644
--- a/repertory/repertory_test/src/file_manager_open_file_test.cpp
+++ b/repertory/repertory_test/src/file_manager_open_file_test.cpp
@@ -274,7 +274,7 @@ TEST(open_file, write_with_incomplete_download) {
   test_state();
 
   o.close();
-  nf->close();
+  nf.close();
 
   test_state();
 
diff --git a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
index c9112e23..768fc41e 100644
--- a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
+++ b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
@@ -401,9 +401,8 @@ TEST(ring_buffer_open_file, read_full_file_in_reverse) {
         EXPECT_FALSE(stop_requested);
         std::size_t bytes_read{};
         data.resize(size);
-        auto ret = nf.read_bytes(data, offset, &bytes_read)
-                       ? api_error::success
-                       : api_error::os_error;
+        auto ret = nf.read(data, offset, &bytes_read) ? api_error::success
+                                                      : api_error::os_error;
         EXPECT_EQ(bytes_read, data.size());
         return ret;
       });
@@ -461,9 +460,8 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
         EXPECT_FALSE(stop_requested);
         std::size_t bytes_read{};
         data.resize(size);
-        auto ret = nf.read_bytes(data, offset, &bytes_read)
-                       ? api_error::success
-                       : api_error::os_error;
+        auto ret = nf.read(data, offset, &bytes_read) ? api_error::success
+                                                      : api_error::os_error;
         EXPECT_EQ(bytes_read, data.size());
         return ret;
       });
@@ -471,8 +469,8 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
     file_manager::ring_buffer_open_file rb(ring_buffer_dir, test_chunk_size,
                                            30U, fsi, mp, 8u);
 
-    auto nf2 =
-        utils::file::file::open_or_create_file(dest_path) : EXPECT_TRUE(nf2);
+    auto nf2 = utils::file::file::open_or_create_file(dest_path);
+    EXPECT_TRUE(nf2);
 
     auto total_read = std::uint64_t(0u);
 
@@ -481,7 +479,7 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
       EXPECT_EQ(api_error::success, rb.read(3u, total_read, data));
 
       std::size_t bytes_written{};
-      EXPECT_TRUE(nf2.write_bytes(data, total_read, &bytes_written));
+      EXPECT_TRUE(nf2.write(data, total_read, &bytes_written));
       total_read += data.size();
     }
     nf2.close();
@@ -497,7 +495,8 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
 TEST(ring_buffer_open_file, read_full_file_in_partial_chunks_in_reverse) {
   const auto download_source_path =
       test::generate_test_file_name("ring_buffer_open_file");
-  auto nf = create_random_file(download_source_path, test_chunk_size * 32u);
+  auto nf =
+      test::create_random_file(download_source_path, test_chunk_size * 32u);
 
   const auto dest_path = test::generate_test_file_name("ring_buffer_open_file");
 
@@ -529,7 +528,7 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks_in_reverse) {
                                            30U, fsi, mp, 8u);
 
     auto nf2 = utils::file::file::open_or_create_file(dest_path);
-    EXPERT_TRUE(nf2);
+    EXPECT_TRUE(nf2);
 
     auto total_read = std::uint64_t(0u);
     const auto read_size = 3u;