diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs
index 5f1a040525fd..09880b4803f6 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs
@@ -92,32 +92,12 @@ public override string TransformText()
             
             #line default
             #line hidden
-            this.Write("[assembly: InternalsVisibleTo(\"AWSSDK.UnitTests.S3.NetFramework, PublicKey=002400" +
-                    "0004800000940000000602000000240000525341310004000001000100db5f59f098d27276c78338" +
-                    "75a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa7" +
-                    "6adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a4799" +
-                    "67c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[" +
-                    "assembly: InternalsVisibleTo(\"AWSSDK.UnitTests.NetFramework, PublicKey=002400000" +
-                    "4800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a" +
-                    "6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76ad" +
-                    "c811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c" +
-                    "3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n\r\n//" +
-                    " We should remove this in the future when TransferUtility Upload/Download direct" +
-                    "ory methods return responses.\r\n// We should update the Integration Tests in Tran" +
-                    "sferUtilityTests.cs to not use the internal methods and instead use the new publ" +
-                    "ic ones that return responses.\r\n[assembly: InternalsVisibleTo(\"AWSSDK.Integratio" +
-                    "nTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341" +
-                    "310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745" +
-                    "db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba89" +
-                    "1f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28" +
-                    "f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: InternalsVisibleTo(\"DynamicPro" +
-                    "xyGenAssembly2, PublicKey=002400000480000094000000060200000024000052534131000400" +
-                    "0001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734a" +
-                    "a39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64" +
-                    "bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be" +
-                    "11e6a7d3113e92484cf7045cc7\")]\r\n");
-            
-            #line 37 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+            this.Write(@"[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
+[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
+[assembly: InternalsVisibleTo(""DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"")]
+");
+            
+            #line 33 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
  } 
             
             #line default
@@ -146,14 +126,14 @@ public override string TransformText()
 // [assembly: AssemblyVersion(""1.0.*"")]
 [assembly: AssemblyVersion(""");
             
-            #line 60 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+            #line 56 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceVersion));
             
             #line default
             #line hidden
             this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
             
-            #line 61 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+            #line 57 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
             
             #line default
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt
index fbed276512ca..31dceb950beb 100644
--- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt
@@ -29,10 +29,6 @@ using System.Runtime.CompilerServices;
 <# if (this.Config.AssemblyTitle=="AWSSDK.S3") { #>
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
-
-// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
-// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
-[assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 <# } #>
 [assembly: AssemblyConfiguration("")]
diff --git a/sdk/src/Services/S3/Properties/AssemblyInfo.cs b/sdk/src/Services/S3/Properties/AssemblyInfo.cs
index 9c65f527a8c4..980e732be31d 100644
--- a/sdk/src/Services/S3/Properties/AssemblyInfo.cs
+++ b/sdk/src/Services/S3/Properties/AssemblyInfo.cs
@@ -21,10 +21,6 @@
 
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
-
-// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
-// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
-[assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Amazon Web Services SDK for .NET")]
diff --git a/sdk/test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj b/sdk/test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj
index 53471f142b89..5fb4162b7a2d 100644
--- a/sdk/test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj
+++ b/sdk/test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj
@@ -16,23 +16,9 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-	<SignAssembly>true</SignAssembly>
     <NoWarn>CS1591,CS0612,CS0618</NoWarn>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>	
   </PropertyGroup>
-	
-	<Choose>
-		<When Condition=" '$(AWSKeyFile)' == '' ">
-			<PropertyGroup>
-				<AssemblyOriginatorKeyFile>../../awssdk.dll.snk</AssemblyOriginatorKeyFile>
-			</PropertyGroup>
-		</When>
-		<Otherwise>
-			<PropertyGroup>
-				<AssemblyOriginatorKeyFile>$(AWSKeyFile)</AssemblyOriginatorKeyFile>
-			</PropertyGroup>
-		</Otherwise>
-	</Choose>
   
   <ItemGroup>
     <Compile Remove="**/**" />
diff --git a/sdk/test/Services/S3/IntegrationTests/AWSSDK.IntegrationTests.S3.NetFramework.csproj b/sdk/test/Services/S3/IntegrationTests/AWSSDK.IntegrationTests.S3.NetFramework.csproj
index 832f59d0fece..fcf55937873e 100644
--- a/sdk/test/Services/S3/IntegrationTests/AWSSDK.IntegrationTests.S3.NetFramework.csproj
+++ b/sdk/test/Services/S3/IntegrationTests/AWSSDK.IntegrationTests.S3.NetFramework.csproj
@@ -16,23 +16,9 @@
 	<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
 	<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
 	<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-	<SignAssembly>true</SignAssembly>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	<NoWarn>CS1591,CS0612,CS0618</NoWarn>
   </PropertyGroup>
-	
-	<Choose>
-		<When Condition=" '$(AWSKeyFile)' == '' ">
-			<PropertyGroup>
-				<AssemblyOriginatorKeyFile>../../../../awssdk.dll.snk</AssemblyOriginatorKeyFile>
-			</PropertyGroup>
-		</When>
-		<Otherwise>
-			<PropertyGroup>
-				<AssemblyOriginatorKeyFile>$(AWSKeyFile)</AssemblyOriginatorKeyFile>
-			</PropertyGroup>
-		</Otherwise>
-	</Choose>
 
   <ItemGroup>
 
diff --git a/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs b/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs
index e3f1fa4a2272..bdc72ecdcea4 100644
--- a/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs
+++ b/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs
@@ -2594,10 +2594,7 @@ public async Task UploadDirectoryFailurePolicy_ContinueOnFailure_AllFailures()
                     };
 
                     // ContinueOnFailure should not throw even if all uploads fail
-                    var config = new TransferUtilityConfig();
-                    var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
-                    command.UploadFilesConcurrently = request.UploadFilesConcurrently;
-                    var response = await command.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
+                    var response = await transferUtility.UploadDirectoryWithResponseAsync(request);
 
                     Assert.IsNotNull(response);
                     Assert.AreEqual(0, response.ObjectsUploaded);
@@ -2631,10 +2628,7 @@ public async Task UploadDirectoryFailurePolicy_ContinueOnFailure_AllSuccess()
                         UploadFilesConcurrently = true
                     };
 
-                    var config = new TransferUtilityConfig();
-                    var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
-                    command.UploadFilesConcurrently = request.UploadFilesConcurrently;
-                    var response = await command.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
+                    var response = await transferUtility.UploadDirectoryWithResponseAsync(request);
 
                     Assert.IsNotNull(response);
                     Assert.AreEqual(3, response.ObjectsUploaded);
@@ -2672,10 +2666,7 @@ public async Task UploadDirectoryFailurePolicy_AbortOnFailure_Throws()
                         UploadFilesConcurrently = true
                     };
 
-                    var config = new TransferUtilityConfig();
-                    var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
-                    command.UploadFilesConcurrently = request.UploadFilesConcurrently;
-                    await Assert.ThrowsExceptionAsync<AmazonS3Exception>(() => command.ExecuteAsync(CancellationToken.None));
+                    await Assert.ThrowsExceptionAsync<AmazonS3Exception>(() => transferUtility.UploadDirectoryWithResponseAsync(request));
                 }
             }
             finally