diff --git a/sdk/core/azure-core-test/src/test_proxy_manager.cpp b/sdk/core/azure-core-test/src/test_proxy_manager.cpp
index 9e7d0bae6..e7bbdb014 100644
--- a/sdk/core/azure-core-test/src/test_proxy_manager.cpp
+++ b/sdk/core/azure-core-test/src/test_proxy_manager.cpp
@@ -242,11 +242,20 @@ void TestProxyManager::SetProxySanitizer()
 
   addSanitizer(SanitizerType::General, g_accountRegex, "account");
   addSanitizer(SanitizerType::Body, "client_secret=(?<clientsecret>[^&]+)", "clientsecret");
+  addSanitizer(SanitizerType::Body, "client_id=(?<clientid>[^&]+)", "clientid");
   const std::string storageSasSignatureRegex = "\\?.*sig=(?<sassig>[a-zA-Z0-9\\%\\/+=]+)";
   addSanitizer(SanitizerType::Uri, storageSasSignatureRegex, "sassig");
   addSanitizer(SanitizerType::Header, storageSasSignatureRegex, "sassig", "x-ms-copy-source");
   addSanitizer(SanitizerType::Header, storageSasSignatureRegex, "sassig", "x-ms-rename-source");
   addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-copy-source-authorization");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-encryption-key");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-rename-source");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-file-rename-source");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-copy-source");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-copy-source-authorization");
+  addSanitizer(
+      SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-file-rename-source-authorization");
+  addSanitizer(SanitizerType::Header, "(?<auth>.+)", "auth", "x-ms-encryption-key-sha256");
   addSanitizer(SanitizerType::Header, "(?<cookie>.+)", "cookie", "Cookie");
   addSanitizer(SanitizerType::Header, "(?<cookie>.+)", "cookie", "Set-Cookie");
   const std::string storageUserDelegationKeyRegex
diff --git a/sdk/storage/README.md b/sdk/storage/README.md
index 91840135f..e98d4ae85 100644
--- a/sdk/storage/README.md
+++ b/sdk/storage/README.md
@@ -35,4 +35,4 @@ additional questions or comments.
 [cla]: https://cla.microsoft.com
 [coc]: https://opensource.microsoft.com/codeofconduct/
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
-[coc_contact]: mailto:opencode@microsoft.com
\ No newline at end of file
+[coc_contact]: mailto:opencode@microsoft.com
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
index 9a7c2ebcb..18ca1cc28 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
@@ -616,7 +616,7 @@ namespace Azure { namespace Storage { namespace Test {
     }
   }
 
-  TEST_F(BlobContainerClientTest, CustomerProvidedKey)
+  TEST_F(BlobContainerClientTest, CustomerProvidedKey_LIVEONLY_)
   {
     auto sourceContainerClient = *m_blobContainerClient;
 
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
index 313e50706..25044c4ab 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
@@ -322,7 +322,7 @@ namespace Azure { namespace Storage { namespace Test {
     }
   }
 
-  TEST_F(DataLakeFileSystemClientTest, CustomerProvidedKey)
+  TEST_F(DataLakeFileSystemClientTest, CustomerProvidedKey_LIVEONLY_)
   {
     auto getRandomCustomerProvidedKey = [&]() {
       Files::DataLake::EncryptionKey key;
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
index 15ed3a699..452bc6e52 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.cpp
@@ -120,7 +120,7 @@ namespace Azure { namespace Storage { namespace Test {
     }
   }
 
-  TEST_F(FileShareDirectoryClientTest, RenameFile)
+  TEST_F(FileShareDirectoryClientTest, RenameFile_LIVEONLY_)
   {
     const std::string baseName = RandomString();
     const std::string baseDirectoryName = baseName + "1";
@@ -285,7 +285,7 @@ namespace Azure { namespace Storage { namespace Test {
     }
   }
 
-  TEST_F(FileShareDirectoryClientTest, RenameSubdirectory)
+  TEST_F(FileShareDirectoryClientTest, RenameSubdirectory_LIVEONLY_)
   {
     const std::string baseName = RandomString();
     const std::string baseDirectoryName = baseName + "1";
@@ -999,7 +999,7 @@ namespace Azure { namespace Storage { namespace Test {
     testTrailingDot(false);
   }
 
-  TEST_F(FileShareDirectoryClientTest, RenameAllowTrailingDot)
+  TEST_F(FileShareDirectoryClientTest, RenameAllowTrailingDot_LIVEONLY_)
   {
     const std::string directoryNameWithTrailingDot = RandomString() + ".";
     const std::string connectionString = StandardStorageConnectionString();
@@ -1099,7 +1099,7 @@ namespace Azure { namespace Storage { namespace Test {
     testTrailingDot(false, false);
   }
 
-  TEST_F(FileShareDirectoryClientTest, OAuth_PLAYBACKONLY_)
+  TEST_F(FileShareDirectoryClientTest, DISABLED_OAuth)
   {
     const std::string directoryName = RandomString();
 
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
index 749e3d237..a817b4437 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
@@ -901,7 +901,7 @@ namespace Azure { namespace Storage { namespace Test {
     }
   }
 
-  TEST_F(FileShareFileClientTest, GetRangeListDiffWithRename_PLAYBACKONLY_)
+  TEST_F(FileShareFileClientTest, DISABLED_GetRangeListDiffWithRename)
   {
     size_t rangeSize = 128;
     std::vector<uint8_t> rangeContent = RandomBuffer(rangeSize);
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 54b1d528c..4cdd6b240 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -29,7 +29,7 @@ extends:
       # Not running tests on CI but only on LiveTest mode
       CtestRegex: azure-storage
       LineCoverageTarget: 85
-      BranchCoverageTarget: 50
+      BranchCoverageTarget: 49
       LiveTestCtestRegex: azure-storage
       Clouds: Preview
       SupportedClouds: Preview