diff --git a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAPITests.groovy b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAPITests.groovy
index 7c86a901dcd6..400779707a2b 100644
--- a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAPITests.groovy
+++ b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAPITests.groovy
@@ -90,18 +90,6 @@ class DirectoryAPITests extends APISpec {
         FileTestHelper.assertResponseStatusCode(primaryDirectoryClient.createWithResponse(null, null, testMetadata, null, null), 201)
     }
 
-    def "Create directory error with metadata"() {
-        given:
-        def errorMetadata = Collections.singletonMap("testMeta", "value")
-
-        when:
-        primaryDirectoryClient.createWithResponse(null, null, errorMetadata, null, null)
-
-        then:
-        def e = thrown(StorageException)
-        FileTestHelper.assertExceptionStatusCodeAndMessage(e, 403, StorageErrorCode.AUTHENTICATION_FAILED)
-    }
-
     def "Create directory with file permission"() {
         when:
         def resp = primaryDirectoryClient.createWithResponse(null, filePermission, null, null, null)
diff --git a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAsyncAPITests.groovy b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAsyncAPITests.groovy
index 1374993587a2..31b615a62b06 100644
--- a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAsyncAPITests.groovy
+++ b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAsyncAPITests.groovy
@@ -92,17 +92,6 @@ class DirectoryAsyncAPITests extends APISpec {
             }.verifyComplete()
     }
 
-    def "Create directory error with metadata"() {
-        given:
-        def errorMetadata = Collections.singletonMap("testMeta", "value")
-        when:
-        def createMetadataErrorVerifier = StepVerifier.create(primaryDirectoryAsyncClient.createWithResponse(null, null, errorMetadata))
-        then:
-        createMetadataErrorVerifier.verifyErrorSatisfies {
-            assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, 403, StorageErrorCode.AUTHENTICATION_FAILED)
-        }
-    }
-
     def "Create directory with file permission"() {
         expect:
         StepVerifier.create(primaryDirectoryAsyncClient.createWithResponse(null, filePermission, testMetadata))
diff --git a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAPITests.groovy b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAPITests.groovy
index 40c55b4f2c06..04d66bfb83c6 100644
--- a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAPITests.groovy
+++ b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAPITests.groovy
@@ -124,18 +124,12 @@ class FileAPITests extends APISpec {
         resp.getValue().getSmbProperties().getFileId()
     }
 
-    @Unroll
     def "Create file with args error"() {
         when:
-        primaryFileClient.createWithResponse(maxSize, null, null, null, metadata, null, null)
+        primaryFileClient.createWithResponse(-1, null, null, null, testMetadata, null, null)
         then:
         def e = thrown(StorageException)
-        FileTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)
-
-        where:
-        maxSize | metadata                                      | statusCode | errMsg
-        -1      | testMetadata                                  | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
-        1024    | Collections.singletonMap("testMeta", "value") | 403        | StorageErrorCode.AUTHENTICATION_FAILED
+        FileTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_INPUT)
     }
 
     @Unroll
diff --git a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAsyncAPITests.groovy b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAsyncAPITests.groovy
index f79e2729a880..34d8e2fd4697 100644
--- a/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAsyncAPITests.groovy
+++ b/sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAsyncAPITests.groovy
@@ -126,20 +126,14 @@ class FileAsyncAPITests extends APISpec {
             }.verifyComplete()
     }
 
-    @Unroll
     def "Create file with args error"() {
         when:
-        def createFileErrorVerifier = StepVerifier.create(primaryFileAsyncClient.createWithResponse(maxSize, null, null, null, metadata))
+        def createFileErrorVerifier = StepVerifier.create(primaryFileAsyncClient.createWithResponse(-1, null, null, null, testMetadata))
 
         then:
         createFileErrorVerifier.verifyErrorSatisfies {
-            assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
+            assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_INPUT)
         }
-
-        where:
-        maxSize | metadata                                      | statusCode | errMsg
-        -1      | testMetadata                                  | 400        | StorageErrorCode.OUT_OF_RANGE_INPUT
-        1024    | Collections.singletonMap("testMeta", "value") | 403        | StorageErrorCode.AUTHENTICATION_FAILED
     }
 
     def "Upload and download data"() {
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAPITestsCreateDirectoryErrorWithMetadata.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAPITestsCreateDirectoryErrorWithMetadata.json
deleted file mode 100644
index 472517d40872..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAPITestsCreateDirectoryErrorWithMetadata.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/directoryapitestscreatedirectoryerrorwithmetadata30321b37?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "7a332b95-dd02-49a0-84c9-293c4ca6395e"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325B7C4794B0\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:48:00 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "07339b77-301a-000d-2d44-645aef000000",
-      "Date" : "Thu, 05 Sep 2019 23:47:59 GMT",
-      "x-ms-client-request-id" : "7a332b95-dd02-49a0-84c9-293c4ca6395e"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/directoryapitestscreatedirectoryerrorwithmetadata30321b37/directoryapitestscreatedirectoryerrorwithmetadata852261d2?restype=directory",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "7504bec0-e80d-4a0c-8f35-a86c1fcf8875"
-    },
-    "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
-      "retry-after" : "0",
-      "Content-Length" : "959",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "07339b79-301a-000d-2e44-645aef000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:07339b79-301a-000d-2e44-645aef000000\nTime:2019-09-05T23:48:00.5663209Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'fdceDpxLUq90lMfGTWkfSAzE2d8yHdba4QsT83HxD/o=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 05 Sep 2019 23:48:00 GMT\n\n\n\n\n\nx-ms-client-request-id:7504bec0-e80d-4a0c-8f35-a86c1fcf8875\nx-ms-file-attributes:None\nx-ms-file-creation-time:Now\nx-ms-file-last-write-time:Now\nx-ms-file-permission:Inherit\nx-ms-meta-testmeta:value\nx-ms-version:2019-02-02\n/gapradev/directoryapitestscreatedirectoryerrorwithmetadata30321b37/directoryapitestscreatedirectoryerrorwithmetadata852261d2\nrestype:directory'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:47:59 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "directoryapitestscreatedirectoryerrorwithmetadata30321b37", "directoryapitestscreatedirectoryerrorwithmetadata852261d2" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAsyncAPITestsCreateDirectoryErrorWithMetadata.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAsyncAPITestsCreateDirectoryErrorWithMetadata.json
deleted file mode 100644
index 26ba906f09ba..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/DirectoryAsyncAPITestsCreateDirectoryErrorWithMetadata.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/directoryasyncapitestscreatedirectoryerrorwithmetadata62422?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "286aa742-1449-4ac4-a147-20277ba1ba7e"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325BA5B3F4DD\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:49:09 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "36c45b35-601a-0000-3644-64923b000000",
-      "Date" : "Thu, 05 Sep 2019 23:49:09 GMT",
-      "x-ms-client-request-id" : "286aa742-1449-4ac4-a147-20277ba1ba7e"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/directoryasyncapitestscreatedirectoryerrorwithmetadata62422/directoryasyncapitestscreatedirectoryerrorwithmetadata98530?restype=directory",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "b4afface-6fba-4e8f-a1f7-62b6c1369d3a"
-    },
-    "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
-      "retry-after" : "0",
-      "Content-Length" : "963",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "36c45b3b-601a-0000-3a44-64923b000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:36c45b3b-601a-0000-3a44-64923b000000\nTime:2019-09-05T23:49:10.1721553Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'WCYVzYpzy1gxV4siXE0zCleTDhjVtER9bmtWHyugB5c=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 05 Sep 2019 23:49:10 GMT\n\n\n\n\n\nx-ms-client-request-id:b4afface-6fba-4e8f-a1f7-62b6c1369d3a\nx-ms-file-attributes:None\nx-ms-file-creation-time:Now\nx-ms-file-last-write-time:Now\nx-ms-file-permission:Inherit\nx-ms-meta-testmeta:value\nx-ms-version:2019-02-02\n/gapradev/directoryasyncapitestscreatedirectoryerrorwithmetadata62422/directoryasyncapitestscreatedirectoryerrorwithmetadata98530\nrestype:directory'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:49:09 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "directoryasyncapitestscreatedirectoryerrorwithmetadata62422", "directoryasyncapitestscreatedirectoryerrorwithmetadata98530" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError.json
new file mode 100644
index 000000000000..4b1be98c87e5
--- /dev/null
+++ b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError.json
@@ -0,0 +1,47 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror978624594149f00?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2019-02-02",
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "f66131a7-a3d8-49f6-908f-968d001cd1da"
+    },
+    "Response" : {
+      "x-ms-version" : "2019-02-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "ETag" : "\"0x8D742088ADDA724\"",
+      "Last-Modified" : "Wed, 25 Sep 2019 22:34:35 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "b438eb56-101a-0066-34f1-73822c000000",
+      "Date" : "Wed, 25 Sep 2019 22:34:35 GMT",
+      "x-ms-client-request-id" : "f66131a7-a3d8-49f6-908f-968d001cd1da"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror978624594149f00/fileapitestscreatefilewithargserror56311c9a58e7aa5",
+    "Headers" : {
+      "x-ms-version" : "2019-02-02",
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "1f7f69d0-9caa-4fa8-a6ce-a41a5a552f97"
+    },
+    "Response" : {
+      "x-ms-version" : "2019-02-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "236",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "b438eb5a-101a-0066-36f1-73822c000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The file size exceeds the maximum permissible limit.\nRequestId:b438eb5a-101a-0066-36f1-73822c000000\nTime:2019-09-25T22:34:35.4979914Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:34:35 GMT",
+      "x-ms-client-request-id" : "1f7f69d0-9caa-4fa8-a6ce-a41a5a552f97",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "fileapitestscreatefilewithargserror978624594149f00", "fileapitestscreatefilewithargserror56311c9a58e7aa5" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError0.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError0.json
deleted file mode 100644
index ba74b7c33e9a..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError0.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileapitestscreatefilewithargserror098651b181b4bd7?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "8c06f9df-28dc-4798-83e2-6e55729b6b21"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325B6470D0ED\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "7d4a4687-c01a-0009-6d44-64d7e8000000",
-      "Date" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "x-ms-client-request-id" : "8c06f9df-28dc-4798-83e2-6e55729b6b21"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileapitestscreatefilewithargserror098651b181b4bd7/fileapitestscreatefilewithargserror068945f30b9c0de",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "d21556ac-fee7-4c14-be93-22c8a3eec81a"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeInput",
-      "retry-after" : "0",
-      "Content-Length" : "236",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "7d4a468c-c01a-0009-7044-64d7e8000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The file size exceeds the maximum permissible limit.\nRequestId:7d4a468c-c01a-0009-7044-64d7e8000000\nTime:2019-09-05T23:47:20.5642394Z</Message></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "x-ms-client-request-id" : "d21556ac-fee7-4c14-be93-22c8a3eec81a",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "fileapitestscreatefilewithargserror098651b181b4bd7", "fileapitestscreatefilewithargserror068945f30b9c0de" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError1.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError1.json
deleted file mode 100644
index d66b9e4113c8..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError1.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileapitestscreatefilewithargserror1711786239de6a8?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "1c65c24e-0692-462b-9d9f-cd911742c053"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325B64A72333\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "7d4a4699-c01a-0009-7d44-64d7e8000000",
-      "Date" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "x-ms-client-request-id" : "1c65c24e-0692-462b-9d9f-cd911742c053"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileapitestscreatefilewithargserror1711786239de6a8/fileapitestscreatefilewithargserror1699185751ddb6a",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "b88d75f9-a54d-409e-b22d-eb3e9117ac13"
-    },
-    "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
-      "retry-after" : "0",
-      "Content-Length" : "967",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "7d4a469c-c01a-0009-7f44-64d7e8000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:7d4a469c-c01a-0009-7f44-64d7e8000000\nTime:2019-09-05T23:47:20.9232487Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'ZyTen4ZD/A0HXYc62pEZwXZTT3xJB7WiEGeFFCf85Is=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 05 Sep 2019 23:47:20 GMT\n\n\n\n\n\nx-ms-client-request-id:b88d75f9-a54d-409e-b22d-eb3e9117ac13\nx-ms-content-length:1024\nx-ms-file-attributes:None\nx-ms-file-creation-time:Now\nx-ms-file-last-write-time:Now\nx-ms-file-permission:Inherit\nx-ms-meta-testmeta:value\nx-ms-type:file\nx-ms-version:2019-02-02\n/gapradev/fileapitestscreatefilewithargserror1711786239de6a8/fileapitestscreatefilewithargserror1699185751ddb6a'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:47:20 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "fileapitestscreatefilewithargserror1711786239de6a8", "fileapitestscreatefilewithargserror1699185751ddb6a" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError2.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError2.json
deleted file mode 100644
index f19efe9637dc..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror24159255f00d5b2?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-11-09",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D721C4D36074BB\"",
-      "Last-Modified" : "Thu, 15 Aug 2019 21:09:13 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "ec0e84be-b01a-00a7-44ad-530995000000",
-      "Date" : "Thu, 15 Aug 2019 21:09:13 GMT"
-    }
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror24159255f00d5b2/fileapitestscreatefilewithargserror24044490d9bcaa1",
-    "Headers" : {
-      "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_201; Windows 10 10.0"
-    },
-    "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
-      "retry-after" : "0",
-      "Content-Length" : "865",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "ec0e84c0-b01a-00a7-45ad-530995000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:ec0e84c0-b01a-00a7-45ad-530995000000\nTime:2019-08-15T21:09:14.0445650Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'JP4ooBRaMLGCKgd7WfBQe+F8eRVIvSqyvgiHYQRjr6k=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 15 Aug 2019 21:09:14 GMT\n\n\n\n\n\nx-ms-client-request-id:c726219e-d5d0-4af9-b4c3-d52e318c69dc\nx-ms-content-length:1024\nx-ms-meta-testmeta:value\nx-ms-type:file\nx-ms-version:2018-11-09\n/azstoragesdkaccount/fileapitestscreatefilewithargserror24159255f00d5b2/fileapitestscreatefilewithargserror24044490d9bcaa1'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Thu, 15 Aug 2019 21:09:13 GMT",
-      "Content-Type" : "application/xml"
-    }
-  } ],
-  "variables" : [ "fileapitestscreatefilewithargserror24159255f00d5b2", "fileapitestscreatefilewithargserror24044490d9bcaa1" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError.json
new file mode 100644
index 000000000000..96f47b1c61f0
--- /dev/null
+++ b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError.json
@@ -0,0 +1,48 @@
+{
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileasyncapitestscreatefilewithargserror0901404fd2eb?restype=share",
+    "Headers" : {
+      "x-ms-version" : "2019-02-02",
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "41d188d2-81fd-4bc1-be35-947583a1f221"
+    },
+    "Response" : {
+      "x-ms-version" : "2019-02-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "ETag" : "\"0x8D7420883DD4181\"",
+      "Last-Modified" : "Wed, 25 Sep 2019 22:34:23 GMT",
+      "retry-after" : "0",
+      "Content-Length" : "0",
+      "StatusCode" : "201",
+      "x-ms-request-id" : "6d52a63e-201a-002a-6df1-734533000000",
+      "Date" : "Wed, 25 Sep 2019 22:34:23 GMT",
+      "x-ms-client-request-id" : "41d188d2-81fd-4bc1-be35-947583a1f221"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileasyncapitestscreatefilewithargserror0901404fd2eb/fileasyncapitestscreatefilewithargserror43718206fe6d",
+    "Headers" : {
+      "x-ms-version" : "2019-02-02",
+      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "6e104243-cf87-4b7b-8789-c5a80639b993"
+    },
+    "Response" : {
+      "x-ms-version" : "2019-02-02",
+      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
+      "Connection" : "close",
+      "x-ms-error-code" : "OutOfRangeInput",
+      "retry-after" : "0",
+      "Content-Length" : "236",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "6d52a641-201a-002a-6ef1-734533000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The file size exceeds the maximum permissible limit.\nRequestId:6d52a641-201a-002a-6ef1-734533000000\nTime:2019-09-25T22:34:23.8774540Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:34:23 GMT",
+      "x-ms-client-request-id" : "6e104243-cf87-4b7b-8789-c5a80639b993",
+      "Content-Type" : "application/xml"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ "fileasyncapitestscreatefilewithargserror0901404fd2eb", "fileasyncapitestscreatefilewithargserror43718206fe6d" ]
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError0.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError0.json
deleted file mode 100644
index f6b07f075540..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError0.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileasyncapitestscreatefilewithargserror00916482feaeb?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "6937cff9-849d-469b-92c0-af56724b0fe8"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325B8B9C7939\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:48:26 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "07339d29-301a-000d-0f44-645aef000000",
-      "Date" : "Thu, 05 Sep 2019 23:48:25 GMT",
-      "x-ms-client-request-id" : "6937cff9-849d-469b-92c0-af56724b0fe8"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileasyncapitestscreatefilewithargserror00916482feaeb/fileasyncapitestscreatefilewithargserror000971fc4580e",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "6681e48f-805c-4585-b519-047a26b50cc9"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "OutOfRangeInput",
-      "retry-after" : "0",
-      "Content-Length" : "236",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "07339d2c-301a-000d-1144-645aef000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The file size exceeds the maximum permissible limit.\nRequestId:07339d2c-301a-000d-1144-645aef000000\nTime:2019-09-05T23:48:26.2825031Z</Message></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:48:25 GMT",
-      "x-ms-client-request-id" : "6681e48f-805c-4585-b519-047a26b50cc9",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "fileasyncapitestscreatefilewithargserror00916482feaeb", "fileasyncapitestscreatefilewithargserror000971fc4580e" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError1.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError1.json
deleted file mode 100644
index b4a6be711aac..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/FileAsyncAPITestsCreateFileWithArgsError1.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileasyncapitestscreatefilewithargserror1711601ce812e?restype=share",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "1fd77cdf-c993-4183-bf98-9827e2b8fc96"
-    },
-    "Response" : {
-      "x-ms-version" : "2019-02-02",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D7325B8BD319D9\"",
-      "Last-Modified" : "Thu, 05 Sep 2019 23:48:26 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "07339d2f-301a-000d-1444-645aef000000",
-      "Date" : "Thu, 05 Sep 2019 23:48:25 GMT",
-      "x-ms-client-request-id" : "1fd77cdf-c993-4183-bf98-9827e2b8fc96"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://gapradev.file.core.windows.net/fileasyncapitestscreatefilewithargserror1711601ce812e/fileasyncapitestscreatefilewithargserror10218680d5cd4",
-    "Headers" : {
-      "x-ms-version" : "2019-02-02",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_221; Windows 10 10.0",
-      "x-ms-client-request-id" : "3fbc2f45-0e75-4a05-9a21-545eab341063"
-    },
-    "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
-      "retry-after" : "0",
-      "Content-Length" : "973",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "07339d31-301a-000d-1544-645aef000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:07339d31-301a-000d-1544-645aef000000\nTime:2019-09-05T23:48:26.6395010Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'ZEAECUEBpWwJ8CsMcKmiXX+XasmxDV3dNXusdXwasqM=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nThu, 05 Sep 2019 23:48:26 GMT\n\n\n\n\n\nx-ms-client-request-id:3fbc2f45-0e75-4a05-9a21-545eab341063\nx-ms-content-length:1024\nx-ms-file-attributes:None\nx-ms-file-creation-time:Now\nx-ms-file-last-write-time:Now\nx-ms-file-permission:Inherit\nx-ms-meta-testmeta:value\nx-ms-type:file\nx-ms-version:2019-02-02\n/gapradev/fileasyncapitestscreatefilewithargserror1711601ce812e/fileasyncapitestscreatefilewithargserror10218680d5cd4'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Thu, 05 Sep 2019 23:48:26 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "fileasyncapitestscreatefilewithargserror1711601ce812e", "fileasyncapitestscreatefilewithargserror10218680d5cd4" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-file/src/test/resources/session-records/createFromFileClient.json b/sdk/storage/azure-storage-file/src/test/resources/session-records/createFromFileClient.json
deleted file mode 100644
index 290acd437ef4..000000000000
--- a/sdk/storage/azure-storage-file/src/test/resources/session-records/createFromFileClient.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/filesharename/testdir%2ffile46052765",
-    "Headers" : {
-      "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_212; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-11-09",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D724DE73E05B70\"",
-      "Last-Modified" : "Mon, 19 Aug 2019 19:50:14 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "07d2b78c-e01a-0111-17c7-564138000000",
-      "x-ms-request-server-encrypted" : "true",
-      "Date" : "Mon, 19 Aug 2019 19:50:13 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "HEAD",
-    "Uri" : "https://azstoragesdkaccount.file.core.windows.net/filesharename/testdir%2ffile46052765",
-    "Headers" : {
-      "x-ms-version" : "2018-11-09",
-      "User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.3 1.8.0_212; Windows 10 10.0"
-    },
-    "Response" : {
-      "x-ms-server-encrypted" : "true",
-      "x-ms-type" : "File",
-      "x-ms-version" : "2018-11-09",
-      "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
-      "ETag" : "\"0x8D724DE73E05B70\"",
-      "Last-Modified" : "Mon, 19 Aug 2019 19:50:14 GMT",
-      "retry-after" : "0",
-      "Content-Length" : "1024",
-      "StatusCode" : "200",
-      "x-ms-request-id" : "07d2b78d-e01a-0111-18c7-564138000000",
-      "Date" : "Mon, 19 Aug 2019 19:50:13 GMT",
-      "Content-Type" : "application/octet-stream"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "file46052765" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAPITests.groovy
index 10d3c3719409..72282cdf39ba 100644
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAPITests.groovy
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAPITests.groovy
@@ -115,7 +115,6 @@ class QueueAPITests extends APISpec {
         QueueTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMessage)
         where:
         invalidKey     | statusCode | errMessage
-        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_FAILED
         "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
         "12345"        | 400        | StorageErrorCode.INVALID_METADATA
         ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
diff --git a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAysncAPITests.groovy b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAysncAPITests.groovy
index 5122b8892efa..b1f19dadc7a5 100644
--- a/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAysncAPITests.groovy
+++ b/sdk/storage/azure-storage-queue/src/test/java/com/azure/storage/queue/QueueAysncAPITests.groovy
@@ -136,7 +136,6 @@ class QueueAysncAPITests extends APISpec {
         }
         where:
         invalidKey     | statusCode | errMessage
-        "invalidMeta"  | 403        | StorageErrorCode.AUTHENTICATION_FAILED
         "invalid-meta" | 400        | StorageErrorCode.INVALID_METADATA
         "12345"        | 400        | StorageErrorCode.INVALID_METADATA
         ""             | 400        | StorageErrorCode.EMPTY_METADATA_KEY
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
index 35967a6ea9e6..c8f7ff479735 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta0.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta005165f491453932314",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta04409862ea68168d0f4",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "dfb95284-aac3-466c-845e-c24c54b34521"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "7e1cd64b-e3b6-4bbe-ba0a-66e6bc508b46"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,30 +13,31 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b1814651-6003-00c8-2ac2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:39 GMT"
+      "x-ms-request-id" : "f7f7c608-b003-0085-0dee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta005165f491453932314?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta04409862ea68168d0f4?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "1fac3489-a267-4222-9d8e-ba2c07cf4056"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "50da1c24-00ea-4fbc-be5a-1f5f27be774b"
     },
     "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
       "retry-after" : "0",
-      "Content-Length" : "787",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "b1814656-6003-00c8-2dc2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:b1814656-6003-00c8-2dc2-62a141000000\nTime:2019-09-04T01:45:40.5960524Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'JYaLZjjdjNEXjdVN7b0yupSwTD4Y8zchP7cO+ZHN79M=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nWed, 04 Sep 2019 01:45:38 GMT\n\n\n\n\n\nx-ms-client-request-id:1fac3489-a267-4222-9d8e-ba2c07cf4056\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueapitestssetinvalidmeta005165f491453932314\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "f7f7c60d-b003-0085-11ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:f7f7c60d-b003-0085-11ee-7367a3000000\nTime:2019-09-25T22:13:40.7254673Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueapitestssetinvalidmeta005165f491453932314" ]
+  "variables" : [ "queueapitestssetinvalidmeta04409862ea68168d0f4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
index dfd82c1cc0c4..8ba58ff27f29 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta1.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta171832595e05acc89c4",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta110170799c642936fd4",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "f46069d7-e48b-4271-949f-ccd3ce26f8b5"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "0ad450a2-d851-4f79-a768-d7587934f8bb"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,17 +13,17 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b181465a-6003-00c8-31c2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT"
+      "x-ms-request-id" : "f7f7c627-b003-0085-29ee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta171832595e05acc89c4?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta110170799c642936fd4?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "978deb87-d525-49e7-934d-4d59c021d0cd"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "c32576df-c551-43b5-9647-1e5d8b3470cf"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -32,12 +32,12 @@
       "retry-after" : "0",
       "Content-Length" : "260",
       "StatusCode" : "400",
-      "x-ms-request-id" : "b181465e-6003-00c8-34c2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:b181465e-6003-00c8-34c2-62a141000000\nTime:2019-09-04T01:45:40.7301785Z</Message></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT",
+      "x-ms-request-id" : "f7f7c633-b003-0085-31ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:f7f7c633-b003-0085-31ee-7367a3000000\nTime:2019-09-25T22:13:40.8595949Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueapitestssetinvalidmeta171832595e05acc89c4" ]
+  "variables" : [ "queueapitestssetinvalidmeta110170799c642936fd4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
index 9c1c636cb4b4..5792d51bb64a 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta2.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta203112399e7b2e3f904",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta272171df6992aae98d4",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "a67034cf-33dd-41ba-834e-4bea20f88be0"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "f4de6b74-6364-43d3-af7b-8403b7aa8a4b"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,31 +13,31 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b1814667-6003-00c8-3cc2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT"
+      "x-ms-request-id" : "f7f7c643-b003-0085-3eee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta203112399e7b2e3f904?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta272171df6992aae98d4?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "b38b7280-85cb-42ad-872a-134cae8884cd"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "25c7a9ed-7656-4d23-9c65-8f35112b9e6a"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidMetadata",
+      "x-ms-error-code" : "EmptyMetadataKey",
       "retry-after" : "0",
-      "Content-Length" : "260",
+      "Content-Length" : "278",
       "StatusCode" : "400",
-      "x-ms-request-id" : "b181466b-6003-00c8-3ec2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:b181466b-6003-00c8-3ec2-62a141000000\nTime:2019-09-04T01:45:40.8703102Z</Message></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT",
+      "x-ms-request-id" : "f7f7c648-b003-0085-42ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:f7f7c648-b003-0085-42ee-7367a3000000\nTime:2019-09-25T22:13:40.9887176Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:40 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueapitestssetinvalidmeta203112399e7b2e3f904" ]
+  "variables" : [ "queueapitestssetinvalidmeta272171df6992aae98d4" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
deleted file mode 100644
index fd74f0c21554..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAPITestsSetInvalidMeta3.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta342327ff9036f707c34",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "9e3c8560-e849-4400-9762-46d03f572a45"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "b1814679-6003-00c8-49c2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueapitestssetinvalidmeta342327ff9036f707c34?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "3892053c-0c73-4284-966c-451797463b79"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "EmptyMetadataKey",
-      "retry-after" : "0",
-      "Content-Length" : "278",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "b181467c-6003-00c8-4bc2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:b181467c-6003-00c8-4bc2-62a141000000\nTime:2019-09-04T01:45:41.0204517Z</Message><MetadataValue>value</MetadataValue></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:40 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "queueapitestssetinvalidmeta342327ff9036f707c34" ]
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
index fc093946ca5d..b4634b091256 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta0.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta0988020102ba170aa",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta05950644925d01a49",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "78620b68-dad6-40f5-b6c6-b2429fb2190d"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "95fa6cb4-a334-464c-8dc8-2154d16bf37f"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,30 +13,31 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b1814b19-6003-00c8-03c2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:53 GMT"
+      "x-ms-request-id" : "f7f7d117-b003-0085-10ee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta0988020102ba170aa?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta05950644925d01a49?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "a6b036d8-1373-49f8-9172-f6aae32aa90e"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "f1cb6143-deb2-4781-88c6-060b03e65c36"
     },
     "Response" : {
-      "Server" : "Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "AuthenticationFailed",
+      "x-ms-version" : "2018-03-28",
+      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
+      "x-ms-error-code" : "InvalidMetadata",
       "retry-after" : "0",
-      "Content-Length" : "790",
-      "StatusCode" : "403",
-      "x-ms-request-id" : "b1814b1d-6003-00c8-06c2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>AuthenticationFailed</Code><Message>Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.\nRequestId:b1814b1d-6003-00c8-06c2-62a141000000\nTime:2019-09-04T01:45:54.3549168Z</Message><AuthenticationErrorDetail>The MAC signature found in the HTTP request 'q7HqcSluPoLojFlHA5CcFq9GSIS1FUdLgphsw8xR8sE=' is not the same as any computed signature. Server used following string to sign: 'PUT\n\n\n\n\n\nWed, 04 Sep 2019 01:45:52 GMT\n\n\n\n\n\nx-ms-client-request-id:a6b036d8-1373-49f8-9172-f6aae32aa90e\nx-ms-meta-invalidmeta:value\nx-ms-version:2018-03-28\n/azstoragesdkaccount/queueaysncapitestssetinvalidmeta0988020102ba170aa\ncomp:metadata'.</AuthenticationErrorDetail></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:53 GMT",
+      "Content-Length" : "260",
+      "StatusCode" : "400",
+      "x-ms-request-id" : "f7f7d122-b003-0085-19ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:f7f7d122-b003-0085-19ee-7367a3000000\nTime:2019-09-25T22:13:54.6386914Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueaysncapitestssetinvalidmeta0988020102ba170aa" ]
+  "variables" : [ "queueaysncapitestssetinvalidmeta05950644925d01a49" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
index 3eb5064ddf73..a954fb2f8602 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta1.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta150757a486572bb4d",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta14859458575e9598a",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "692ee7ba-d11a-4258-a859-40e2583db307"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "d1e01768-e81a-4022-9e4f-4fd189511aa3"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,17 +13,17 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b1814b2a-6003-00c8-11c2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:53 GMT"
+      "x-ms-request-id" : "f7f7d13e-b003-0085-31ee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta150757a486572bb4d?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta14859458575e9598a?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "4fd3c113-db3c-4b40-a57b-6f08e21f887f"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "6710b740-3690-4968-99f0-81c6b2c921ff"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -32,12 +32,12 @@
       "retry-after" : "0",
       "Content-Length" : "260",
       "StatusCode" : "400",
-      "x-ms-request-id" : "b1814b30-6003-00c8-14c2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:b1814b30-6003-00c8-14c2-62a141000000\nTime:2019-09-04T01:45:54.4950499Z</Message></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:53 GMT",
+      "x-ms-request-id" : "f7f7d146-b003-0085-38ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:f7f7d146-b003-0085-38ee-7367a3000000\nTime:2019-09-25T22:13:54.8568990Z</Message></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueaysncapitestssetinvalidmeta150757a486572bb4d" ]
+  "variables" : [ "queueaysncapitestssetinvalidmeta14859458575e9598a" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
index af13df649916..936f0b1d570b 100644
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
+++ b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta2.json
@@ -1,11 +1,11 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta238089e39f886db45",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta2793639d580edebc8",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "231435ab-0cc1-4693-9132-b96541fa0951"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "948db618-0c34-480b-8c15-cb78fb0c6ded"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
@@ -13,31 +13,31 @@
       "retry-after" : "0",
       "Content-Length" : "0",
       "StatusCode" : "201",
-      "x-ms-request-id" : "b1814b37-6003-00c8-1bc2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:54 GMT"
+      "x-ms-request-id" : "f7f7d160-b003-0085-4eee-7367a3000000",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta238089e39f886db45?comp=metadata",
+    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta2793639d580edebc8?comp=metadata",
     "Headers" : {
       "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "ba8eb43c-feac-4fd8-966f-a2f259f59390"
+      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
+      "x-ms-client-request-id" : "4cacc89c-8beb-4f0d-a104-c48a2d44e785"
     },
     "Response" : {
       "x-ms-version" : "2018-03-28",
       "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "InvalidMetadata",
+      "x-ms-error-code" : "EmptyMetadataKey",
       "retry-after" : "0",
-      "Content-Length" : "260",
+      "Content-Length" : "278",
       "StatusCode" : "400",
-      "x-ms-request-id" : "b1814b39-6003-00c8-1cc2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>InvalidMetadata</Code><Message>The metadata specified is invalid. It has characters that are not permitted.\nRequestId:b1814b39-6003-00c8-1cc2-62a141000000\nTime:2019-09-04T01:45:54.6281716Z</Message></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:54 GMT",
+      "x-ms-request-id" : "f7f7d16a-b003-0085-57ee-7367a3000000",
+      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:f7f7d16a-b003-0085-57ee-7367a3000000\nTime:2019-09-25T22:13:54.9830186Z</Message><MetadataValue>value</MetadataValue></Error>",
+      "Date" : "Wed, 25 Sep 2019 22:13:54 GMT",
       "Content-Type" : "application/xml"
     },
     "Exception" : null
   } ],
-  "variables" : [ "queueaysncapitestssetinvalidmeta238089e39f886db45" ]
+  "variables" : [ "queueaysncapitestssetinvalidmeta2793639d580edebc8" ]
 }
\ No newline at end of file
diff --git a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json b/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
deleted file mode 100644
index ba8e96a1c41d..000000000000
--- a/sdk/storage/azure-storage-queue/src/test/resources/session-records/QueueAysncAPITestsSetInvalidMeta3.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "networkCallRecords" : [ {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta340756d5090364637",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "d75d0aa6-d5dc-4ff0-8091-84322beb0e44"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "retry-after" : "0",
-      "Content-Length" : "0",
-      "StatusCode" : "201",
-      "x-ms-request-id" : "b1814b41-6003-00c8-24c2-62a141000000",
-      "Date" : "Wed, 04 Sep 2019 01:45:54 GMT"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "PUT",
-    "Uri" : "https://azstoragesdkaccount.queue.core.windows.net/queueaysncapitestssetinvalidmeta340756d5090364637?comp=metadata",
-    "Headers" : {
-      "x-ms-version" : "2018-03-28",
-      "User-Agent" : "azsdk-java-azure-storage-queue/12.0.0-preview.3 1.8.0_222; Windows 10 10.0",
-      "x-ms-client-request-id" : "3ee895e0-a77b-42b7-ae06-5718965dd119"
-    },
-    "Response" : {
-      "x-ms-version" : "2018-03-28",
-      "Server" : "Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0",
-      "x-ms-error-code" : "EmptyMetadataKey",
-      "retry-after" : "0",
-      "Content-Length" : "278",
-      "StatusCode" : "400",
-      "x-ms-request-id" : "b1814b45-6003-00c8-27c2-62a141000000",
-      "Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>EmptyMetadataKey</Code><Message>The key for one of the metadata key-value pairs is empty.\nRequestId:b1814b45-6003-00c8-27c2-62a141000000\nTime:2019-09-04T01:45:54.7522883Z</Message><MetadataValue>value</MetadataValue></Error>",
-      "Date" : "Wed, 04 Sep 2019 01:45:54 GMT",
-      "Content-Type" : "application/xml"
-    },
-    "Exception" : null
-  } ],
-  "variables" : [ "queueaysncapitestssetinvalidmeta340756d5090364637" ]
-}
\ No newline at end of file