diff --git a/tests/encrypting_reader_test.cpp b/tests/encrypting_reader_test.cpp
index b93e9ed2..f8d4c95d 100644
--- a/tests/encrypting_reader_test.cpp
+++ b/tests/encrypting_reader_test.cpp
@@ -40,8 +40,8 @@ TEST(encrypting_reader, get_encrypted_file_name) {
   EXPECT_TRUE(source_file != nullptr);
   if (source_file) {
     stop_type stop_requested = false;
-    utils::encryption::encrypting_reader reader("test.dat", source_file_name,
-                                                stop_requested, token);
+    utils::encryption::encrypting_reader reader(
+        "test.dat", source_file_name, stop_requested, token, std::nullopt);
 
     auto file_name = reader.get_encrypted_file_name();
     std::cout << file_name << std::endl;
diff --git a/tests/fixtures/winfsp_fixture.hpp b/tests/fixtures/winfsp_fixture.hpp
index 178c1864..bd8e02b5 100644
--- a/tests/fixtures/winfsp_fixture.hpp
+++ b/tests/fixtures/winfsp_fixture.hpp
@@ -52,7 +52,7 @@ protected:
             "./winfsp_test" + std::to_string(PROVIDER_INDEX)));
 
         app_config src_cfg(provider_type::s3,
-                           utils::path::combine(get_test_dir(), {"filebase"}));
+                           utils::path::combine(get_test_dir(), {"storj"}));
         config = std::make_unique<app_config>(
             provider_type::s3,
             "./winfsp_test" + std::to_string(PROVIDER_INDEX));
@@ -68,6 +68,11 @@ protected:
                          ->set_value_by_name("S3Config.Region",
                                              src_cfg.get_s3_config().region)
                          .empty());
+        EXPECT_FALSE(
+            config
+                ->set_value_by_name("S3Config.EncryptionToken",
+                                    src_cfg.get_s3_config().encryption_token)
+                .empty());
         EXPECT_FALSE(
             config
                 ->set_value_by_name("S3Config.URL", src_cfg.get_s3_config().url)
diff --git a/tests/fuse_drive_test.cpp b/tests/fuse_drive_test.cpp
index 4f549c5e..cf71f3c1 100644
--- a/tests/fuse_drive_test.cpp
+++ b/tests/fuse_drive_test.cpp
@@ -523,9 +523,8 @@ TEST(fuse_drive, all_tests) {
         config_ptr =
             std::make_unique<app_config>(provider_type::s3, cfg_directory);
         {
-          app_config src_cfg(
-              provider_type::s3,
-              utils::path::combine(get_test_dir(), {"filebase"}));
+          app_config src_cfg(provider_type::s3,
+                             utils::path::combine(get_test_dir(), {"storj"}));
           config_ptr->set_enable_drive_events(true);
           config_ptr->set_event_level(event_level::verbose);
           config_ptr->set_s3_config(src_cfg.get_s3_config());
diff --git a/tests/providers_test.cpp b/tests/providers_test.cpp
index ab010e61..9ad019b8 100644
--- a/tests/providers_test.cpp
+++ b/tests/providers_test.cpp
@@ -168,6 +168,10 @@ static void create_directory_clone_source_meta(i_provider &provider) {
 
   EXPECT_EQ(meta_orig.size(), meta_clone.size());
   for (const auto &kv : meta_orig) {
+    if (kv.first == META_KEY) {
+      EXPECT_STRNE(kv.second.c_str(), meta_clone[kv.first].c_str());
+      continue;
+    }
     EXPECT_STREQ(kv.second.c_str(), meta_clone[kv.first].c_str());
   }
 
@@ -579,7 +583,7 @@ TEST(providers, s3_provider) {
     app_config cfg(provider_type::s3, config_path);
     {
       app_config src_cfg(provider_type::s3,
-                         utils::path::combine(get_test_dir(), {"filebase"}));
+                         utils::path::combine(get_test_dir(), {"storj"}));
       cfg.set_s3_config(src_cfg.get_s3_config());
     }