diff --git a/generator/.DevConfigs/72442c5a-03b6-40bf-a34e-4d9621624a42.json b/generator/.DevConfigs/72442c5a-03b6-40bf-a34e-4d9621624a42.json
new file mode 100644
index 000000000000..21f1fcd66dbb
--- /dev/null
+++ b/generator/.DevConfigs/72442c5a-03b6-40bf-a34e-4d9621624a42.json
@@ -0,0 +1,9 @@
+{
+    "core": {
+        "updateMinimum": false,
+        "type": "Patch",
+        "changeLogMessages": [
+            "Placeholder file for dry-run"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/sdk/test/IntegrationTests/MediaStoreData/IntegrationTests/MediaStoreData.cs b/sdk/test/IntegrationTests/MediaStoreData/IntegrationTests/MediaStoreData.cs
deleted file mode 100644
index e922923cb266..000000000000
--- a/sdk/test/IntegrationTests/MediaStoreData/IntegrationTests/MediaStoreData.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-using System;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Amazon.MediaStore;
-using Amazon.MediaStore.Model;
-using Amazon.MediaStoreData;
-using Amazon.MediaStoreData.Model;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ContainerNotFoundException = Amazon.MediaStore.Model.ContainerNotFoundException;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    /// <summary>
-    /// Tests for AWS MediaStoreData service
-    /// </summary>
-    [TestClass]
-    public class MediaStoreData : TestBase<AmazonMediaStoreClient>
-    {
-        /// <summary>
-        /// Name of the container that we want to create in AWS MediaStore Data
-        /// </summary>
-        private const string ContainerName = "TestContainerNetStandard";
-        /// <summary>
-        /// Object Path of the object that we want to create in AWS MediaStore Data
-        /// </summary>
-        private const string ObjectPath = "TestNetStandard";
-        /// <summary>
-        /// Timeout for when a test to fail (in seconds)
-        /// </summary>
-        private const int TestTimeout = 300;
-
-        /// <summary>
-        /// Creates a container in AWS MediaStore Data
-        /// </summary>
-        [TestInitialize]
-        public void Init()
-        {
-            UtilityMethods.WaitUntilSuccess(() =>
-            {
-                // AWS Media Store requires a container in order to call PutObject
-                CreateContainer(ContainerName);
-            });
-        }
-
-        /// <summary>
-        /// Deletes created container
-        /// </summary>
-        [TestCleanup]
-        public void Cleanup()
-        {
-            UtilityMethods.WaitUntilSuccess(() =>
-            {
-                // Delete the created container
-                DeleteContainer(ContainerName);
-            });
-        }
-
-        /// <summary>
-        /// Compresses a payload of type stream of a request using compression while calling <see cref="AmazonMediaStoreDataClient.PutObject"/>.
-        /// </summary>
-        [Ignore("This test is currently turned off because at the time it was written, the models for this service" +
-            " did not have compression traits required to compress the payload of the request. We added those traits manually" +
-          " in the model and ran those tests to make sure that request compression feature works for streams.")]
-        [TestMethod]
-        [TestCategory("MediaStoreData")]
-        public void PutObjectTest()
-        {
-            UtilityMethods.WaitUntilException(() =>
-            {
-                // Get endpoint Url of the created container
-                var endpoint = GetEndpointUrl(ContainerName);
-
-                var config = new AmazonMediaStoreDataConfig
-                {
-                    ServiceURL = endpoint,
-                    DisableRequestCompression = false // Make sure that this flag is false in order to compress the stream
-                };
-
-                using (var client = new AmazonMediaStoreDataClient(config))
-                {
-                    var putObjectRequest = new PutObjectRequest
-                    {
-                        Path = ObjectPath,
-                        Body = new MemoryStream(Encoding.UTF8.GetBytes("Testing 123")), // We are passing a stream to the payload
-                        ContentType = "application/octet-stream"
-                    };
-
-                    // Upload the file to AWS MediaStore Data
-                    var response = client.PutObject(putObjectRequest);
-
-                    Assert.AreEqual(HttpStatusCode.OK, response.HttpStatusCode);
-
-                    WaitForObjectToBeListed(client);
-                }
-            }, 5, TestTimeout);
-        }
-
-        /// <summary>
-        /// Creates a container with name <paramref name="containerName"/> if it doesn't already exist.
-        /// </summary>
-        /// <param name="containerName"> Name of the container that we want to delete </param>
-        private void CreateContainer(string containerName)
-        {
-            var client = new AmazonMediaStoreClient();
-            // Wait until an existing container has been deleted
-            var containerStatus = WaitUntilDescribeContainerConditionMet(client, containerName, (status) => status != ContainerStatus.DELETING, "Container is ready to use!");
-            // Create a container only if it doesn't already exist
-            if (containerStatus == null || containerStatus != ContainerStatus.ACTIVE)
-            {
-                var containerRequest = new CreateContainerRequest()
-                {
-                    ContainerName = containerName,
-                };
-
-                client.CreateContainer(containerRequest);
-                // Wait until container's status is set to active
-                WaitUntilDescribeContainerConditionMet(client, containerName, (status) => status == ContainerStatus.ACTIVE, "Container is ready to use!");
-            }
-        }
-
-        /// <summary>
-        /// Delete container given <paramref name="containerName"/>
-        /// </summary>
-        /// <param name="containerName"> Name of the container that we want to delete </param>
-        private void DeleteContainer(string containerName)
-        {
-            var endpoint = GetEndpointUrl(ContainerName);
-
-            using (var client = new AmazonMediaStoreDataClient(endpoint))
-            {
-                // Delete the objects (files) in the container
-                var listObjectsResponse = client.ListItems(new ListItemsRequest());
-
-                foreach (var item in listObjectsResponse.Items)
-                {
-                    client.DeleteObject(new DeleteObjectRequest
-                    {
-                        Path = item.Name,
-                    });
-
-                }
-
-                var areObjectsDeleted = false;
-                // Wait for all objects to be deleted
-                do
-                {
-                    var listItemsResponse = client.ListItems(new ListItemsRequest());
-                    var remainingObjects = listItemsResponse.Items;
-
-                    // Check if there are any objects left in the container
-                    if (remainingObjects.Count == 0)
-                    {
-                        areObjectsDeleted = true;
-                        Console.WriteLine("All objects in the container are deleted.");
-                    }
-                    else
-                    {
-                        // Sleep for a few seconds before checking again
-                        Thread.Sleep(5000);
-                    }
-                } while (!areObjectsDeleted);
-            }
-
-            using (var client = new AmazonMediaStoreClient())
-            {
-                var containerRequest = new DeleteContainerRequest()
-                {
-                    ContainerName = containerName,
-                };
-
-                client.DeleteContainer(containerRequest);
-            }
-        }
-
-        /// <summary>
-        /// Get endpoint Url based off <paramref name="containerName"/>
-        /// </summary>
-        /// <param name="containerName"> Endpoint Url of the container holding this name </param>
-        /// <returns> Endpoint url of the container </returns>
-        private string GetEndpointUrl(string containerName)
-        {
-            using (var client = new AmazonMediaStoreClient())
-            {
-                var containerRequest = new DescribeContainerRequest()
-                {
-                    ContainerName = containerName,
-                };
-
-                DescribeContainerResponse describeContainerResponse;
-                describeContainerResponse = client.DescribeContainer(containerRequest);
-
-                return describeContainerResponse.Container.Endpoint;
-            }
-        }
-
-
-        // Define a delegate for the condition
-        delegate bool ConditionCheck(ContainerStatus containerStatus);
-
-        /// <summary>
-        /// Call <see cref="AmazonMediaStoreClient.DescribeContainer"/> and wait until condition <paramref name="conditionCheck"/> is met or an exception has been thrown
-        /// </summary>
-        /// <param name="client"> <see cref="AmazonMediaStoreClient"/> client </param>
-        /// <param name="containerName"> Container name </param>
-        /// <param name="conditionCheck"> When this condition is met, we stop calling <see cref="AmazonMediaStoreClient.DescribeContainer"/> </param>
-        /// <param name="successMessage"> Console message for when the condiiton is met </param>
-        /// <returns> Status of the container or null if an exception was thrown </returns>
-        private ContainerStatus WaitUntilDescribeContainerConditionMet(AmazonMediaStoreClient client, string containerName, ConditionCheck conditionCheck, string successMessage)
-        {
-            bool isConditionMet = false;
-
-            do
-            {
-                try
-                {
-                    var describeContainerResponse = client.DescribeContainer(new DescribeContainerRequest()
-                    {
-                        ContainerName = containerName
-                    });
-
-                    var containerStatus = describeContainerResponse.Container.Status;
-
-                    // Check if the specified condition is met
-                    if (conditionCheck(containerStatus))
-                    {
-                        isConditionMet = true;
-                        Console.WriteLine(successMessage);
-                        return containerStatus;
-                    }
-                    else
-                    {
-                        // Sleep for a few seconds before checking the status again
-                        Thread.Sleep(5000);
-                    }
-                }
-                // We don't have an existing container
-                catch (ContainerNotFoundException e)
-                {
-                    Console.WriteLine(e);
-                    return null;
-                }
-            } while (!isConditionMet);
-
-            return null;
-        }
-
-        /// <summary>
-        /// Wait until objects are listed in the container
-        /// </summary>
-        /// <param name="client"> <see cref="AmazonMediaStoreDataClient"/> client </param>
-        private void WaitForObjectToBeListed(AmazonMediaStoreDataClient client)
-        {
-            var isObjectProcessing = true;
-
-            do
-            {
-                // Call DescribeObject to get the object's processing status
-                var describeObjectRequest = new ListItemsRequest
-                {
-                    Path = ""
-                };
-
-                try
-                {
-                    var describeObjectResponse = client.ListItems(describeObjectRequest);
-
-
-                    // Check if the processing status is "Completed"
-                    if (describeObjectResponse?.Items != null)
-                    {
-                        foreach (var item in describeObjectResponse.Items)
-                        {
-                            if (item.Name.Equals(ObjectPath))
-                            {
-                                isObjectProcessing = false;
-                                Console.WriteLine("Object processing is complete.");
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // Object is still processing, wait for the specified interval before retrying
-                        Thread.Sleep(5000);
-                    }
-                }
-                catch (Exception e)
-                {
-                    throw e;
-                }
-            } while (isObjectProcessing);
-        }
-    }
- }
diff --git a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs b/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs
deleted file mode 100644
index 1589fa750a4d..000000000000
--- a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Amazon.AWSMarketplaceCommerceAnalytics;
-using Amazon.AWSMarketplaceCommerceAnalytics.Model;
-using Amazon.IdentityManagement;
-using Amazon.IdentityManagement.Model;
-using Amazon.SimpleNotificationService;
-using Amazon.SimpleNotificationService.Model;
-using Amazon.S3;
-using Amazon.S3.Model;
-using System;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class AWSMarketplaceCommerceAnalytics : TestBase<AmazonAWSMarketplaceCommerceAnalyticsClient>
-    {
-        // You need to set the ExternalId provided by the service for your account before you can run the test.
-        const string ExternalId = "";
-
-        static string TrustPolicy =
-          @"{
-              ""Version"": ""2012-10-17"",
-              ""Statement"": [
-                {
-                  ""Sid"": """",
-                  ""Effect"": ""Allow"",
-                  ""Principal"": {
-                    ""AWS"": ""arn:aws:iam::452565589796:root""
-                  },
-                  ""Action"": ""sts:AssumeRole"",
-                  ""Condition"": {
-                    ""StringEquals"": {
-                      ""sts:ExternalId"": """ + ExternalId + @"""
-                    }
-                  }
-                }
-              ]
-            }";
-
-        static string AccessPolicy =
-           @"{
-              ""Version"": ""2012-10-17"",
-              ""Statement"": [
-                {
-                  ""Sid"": ""1"",
-                  ""Effect"": ""Allow"",
-                  ""Action"": [
-                    ""s3:PutObject"",
-                    ""s3:GetBucketLocation""
-                  ],
-                  ""Resource"": [
-                    ""*""
-                  ]
-                },
-                {
-                  ""Sid"": ""2"",
-                  ""Effect"": ""Allow"",
-                  ""Action"": [
-                    ""sns:Publish"",
-                    ""sns:GetTopicAttributes""
-                  ],
-                  ""Resource"": [
-                    ""*""
-                  ]
-                },
-                {
-                  ""Sid"": ""3"",
-                  ""Effect"": ""Allow"",
-                  ""Action"": [
-                    ""iam:GetRolePolicy""
-                  ],
-                  ""Resource"": [
-                    ""*""
-                  ]
-                }
-              ]
-            }";
-
-        // This test needs account specific details. 
-        // You need to set the ExternalId provided by the service for your account before you can run the test.
-        //[TestMethod]
-        [TestCategory("AWSMarketplaceCommerceAnalytics")]
-        public void GenerateDatasetTest()
-        {
-            var iamClient = new AmazonIdentityManagementServiceClient();
-            var snsClient = new AmazonSimpleNotificationServiceClient();
-            var s3Client = new AmazonS3Client();
-
-            string bucketName = null;
-            string topicArn = null;
-            Role role = null;
-            try
-            {
-                bucketName = UtilityMethods.GenerateName("GenerateDatasetTestBucket");
-                s3Client.PutBucket(bucketName);
-
-                var roleName = UtilityMethods.GenerateName("GenerateDatasetTestRole");
-                var policyName = "MarketplacePolicy";
-                // Create a role with trust policy
-                role = iamClient.CreateRole(new CreateRoleRequest
-                {
-                    RoleName = roleName,
-                    AssumeRolePolicyDocument = TrustPolicy
-                }).Role;
-
-                // Set access policy
-                iamClient.PutRolePolicy(new PutRolePolicyRequest
-                {
-                    RoleName = roleName,
-                    PolicyDocument = AccessPolicy,
-                    PolicyName = policyName
-                });
-
-                var snsTopicName = UtilityMethods.GenerateName("GenerateDatasetTestTopic");
-                topicArn = snsClient.CreateTopic(snsTopicName).TopicArn;
-                
-                // Throws an error as this account does not have any reports
-                Utils.AssertExtensions.ExpectException<AmazonAWSMarketplaceCommerceAnalyticsException>
-                (   () =>
-                    Client.GenerateDataSet(new GenerateDataSetRequest
-                    {
-                        DataSetPublicationDate = DateTime.UtcNow,
-                        DataSetType = DataSetType.DailyBusinessFees,
-                        DestinationS3BucketName = bucketName,
-                        SnsTopicArn = topicArn,
-                        RoleNameArn = role.Arn
-                    })
-                );
-            }
-            finally
-            {
-                s3Client.DeleteBucket(bucketName);
-
-                if (role!=null)
-                {
-                    iamClient.DeleteRolePolicy(new DeleteRolePolicyRequest
-                    {
-                        PolicyName = "MarketplacePolicy",
-                        RoleName = role.RoleName
-                    });
-
-                    iamClient.DeleteRole(new DeleteRoleRequest
-                    {
-                        RoleName = role.RoleName
-                    });
-                }
-
-                if (topicArn !=null)
-                {
-                    snsClient.DeleteTopic(topicArn);
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("AWSMarketplaceCommerceAnalytics")]
-        public void TestInvalidInputs()
-        {
-            // Do not pass destination bucket, role ARN and SNS topic ARN.
-            Utils.AssertExtensions.ExpectException<AmazonAWSMarketplaceCommerceAnalyticsException>
-            (() =>
-                Client.GenerateDataSet(new GenerateDataSetRequest
-                {
-                    DataSetPublicationDate = DateTime.UtcNow,
-                    DataSetType = DataSetType.DailyBusinessFees
-                })
-            );
-
-            // Pass invalid ARN values
-            Utils.AssertExtensions.ExpectException<AmazonAWSMarketplaceCommerceAnalyticsException>
-            (   ()=>
-                Client.GenerateDataSet(new GenerateDataSetRequest
-                {
-                    DataSetPublicationDate = DateTime.UtcNow,
-                    DataSetType = DataSetType.DailyBusinessFees,
-                    DestinationS3BucketName = "randomBucket",
-                    RoleNameArn = "invalidArn",
-                    SnsTopicArn = "invalidArn"
-                })
-            );
-        }
-    }
-}
diff --git a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSSDK.IntegrationTests.AWSMarketplaceCommerceAnalytics.NetFramework.csproj b/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSSDK.IntegrationTests.AWSMarketplaceCommerceAnalytics.NetFramework.csproj
deleted file mode 100644
index 5f59f84455ad..000000000000
--- a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSSDK.IntegrationTests.AWSMarketplaceCommerceAnalytics.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.AWSMarketplaceCommerceAnalytics.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.AWSMarketplaceCommerceAnalytics.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/AWSMarketplaceCommerceAnalytics/AWSSDK.AWSMarketplaceCommerceAnalytics.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/Config/462/App.config b/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/AWSSupport/IntegrationTests/AWSSDK.IntegrationTests.AWSSupport.NetFramework.csproj b/sdk/test/Services/AWSSupport/IntegrationTests/AWSSDK.IntegrationTests.AWSSupport.NetFramework.csproj
deleted file mode 100644
index 3fd01929cf85..000000000000
--- a/sdk/test/Services/AWSSupport/IntegrationTests/AWSSDK.IntegrationTests.AWSSupport.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.AWSSupport.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.AWSSupport.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/AWSSupport/AWSSDK.AWSSupport.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/AWSSupport/IntegrationTests/AWSSupport.cs b/sdk/test/Services/AWSSupport/IntegrationTests/AWSSupport.cs
deleted file mode 100644
index 3197083c918e..000000000000
--- a/sdk/test/Services/AWSSupport/IntegrationTests/AWSSupport.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.AWSSupport;
-using Amazon.AWSSupport.Model;
-using Amazon;
-using System.IO;
-using System.Text;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    [TestCategory("AWSSupport")]
-    public class AWSSupportTests : TestBase<AmazonAWSSupportClient>
-    {
-        private static String
-            SUBJECT = ".NET SDK Test Case " + DateTime.UtcNow.Ticks,
-            CATEGORY_CODE = "apis",
-            SERVICE_CODE = "amazon-dynamodb",
-            COMMUNICATION_BODY = "This is a test case generated by the .NET SDK integration test suite",
-            LANGUAGE = "ja",
-            SEVERITY_CODE = "low",
-            ATTACHMENT_CONTENTS = "This is test data";
-
-        [ClassCleanup]
-        public static void ClassCleanup()
-        {
-            BaseClean();
-        }
-
-        //  Test are disabled because not all acounts are subscribed to AWS Support
-        //        [TestMethod]
-        public void TestCaseOperations()
-        {
-            string caseId = null;
-
-            try
-            {
-                caseId = Client.CreateCase(new CreateCaseRequest
-                {
-                    Subject = SUBJECT,
-                    CategoryCode = CATEGORY_CODE,
-                    ServiceCode = SERVICE_CODE,
-                    Language = LANGUAGE,
-                    SeverityCode = SEVERITY_CODE,
-                    CommunicationBody = COMMUNICATION_BODY
-                }).CaseId;
-
-                Assert.IsNotNull(caseId);
-
-                var cases = Client.DescribeCases(new DescribeCasesRequest { Language = LANGUAGE }).Cases;
-                Assert.IsTrue(cases.Count > 0);
-
-                cases = Client.DescribeCases(new DescribeCasesRequest { Language = LANGUAGE, CaseIdList = new List<string> { caseId } }).Cases;
-                Assert.AreEqual(1, cases.Count);
-
-                Assert.AreEqual(caseId, cases[0].CaseId);
-                Assert.AreEqual(CATEGORY_CODE, cases[0].CategoryCode);
-                Assert.AreEqual(LANGUAGE, cases[0].Language);
-                Assert.AreEqual(SERVICE_CODE, cases[0].ServiceCode);
-                Assert.AreEqual(SEVERITY_CODE, cases[0].SeverityCode);
-                Assert.IsTrue(cases[0].RecentCommunications.Communications.Count > 0);
-
-                var attachmentData = new MemoryStream(Encoding.UTF8.GetBytes(ATTACHMENT_CONTENTS));
-                var filename = "file1.txt";
-                var attachmentSetId = Client.AddAttachmentsToSet(new AddAttachmentsToSetRequest
-                {
-                    Attachments = new List<Attachment>
-                    {
-                        new Attachment
-                        {
-                            FileName = filename,
-                            Data = attachmentData
-                        }
-                    }
-                }).AttachmentSetId;
-
-                var result = Client.AddCommunicationToCase(new AddCommunicationToCaseRequest
-                {
-                    CaseId = caseId,
-                    CcEmailAddresses = new List<string> { "aws-dr-tools-test@amazon.com" },
-                    CommunicationBody = COMMUNICATION_BODY,
-                    AttachmentSetId = attachmentSetId
-                });
-
-                Assert.IsNotNull(result);
-
-                var comms = Client.DescribeCommunications(new DescribeCommunicationsRequest { CaseId = caseId }).Communications;
-                Assert.IsTrue(comms.Count > 0);
-                Assert.AreEqual(caseId, comms[0].CaseId);
-                Assert.AreEqual(COMMUNICATION_BODY.Trim(), comms[0].Body.Trim());
-                Assert.IsNotNull(comms[0].SubmittedBy);
-                Assert.IsNotNull(comms[0].TimeCreated);
-
-                string attachmentId = null;
-                attachmentId = GetAttachmentId(comms, attachmentId);
-                Assert.IsNotNull(attachmentId);
-
-                VerifyAttachment(attachmentData, filename, attachmentId);
-
-                cases = Client.DescribeCases(new DescribeCasesRequest { Language = LANGUAGE, CaseIdList = new List<string> { caseId }, IncludeCommunications = true }).Cases;
-                Assert.AreEqual(1, cases.Count);
-                var communications = cases[0].RecentCommunications;
-                attachmentId = GetAttachmentId(communications.Communications, attachmentId);
-                VerifyAttachment(attachmentData, filename, attachmentId);
-            }
-            finally
-            {
-                if (caseId != null)
-                {
-                    Client.ResolveCase(new ResolveCaseRequest { CaseId = caseId });
-                }
-            }
-        }
-
-        private static void VerifyAttachment(MemoryStream attachmentData, string filename, string attachmentId)
-        {
-            var attachment = Client.DescribeAttachment(new DescribeAttachmentRequest
-            {
-                AttachmentId = attachmentId
-            }).Attachment;
-            Assert.IsNotNull(attachment);
-            Assert.AreEqual(
-                Encoding.UTF8.GetString(attachmentData.ToArray()),
-                Encoding.UTF8.GetString(attachment.Data.ToArray()));
-            Assert.AreEqual(filename, attachment.FileName);
-        }
-
-        private static string GetAttachmentId(List<Communication> comms, string attachmentId)
-        {
-            foreach (var comm in comms)
-            {
-                var attachmentSet = comm.AttachmentSet;
-                if (attachmentSet != null && attachmentSet.Count > 0)
-                {
-                    foreach (var att in attachmentSet)
-                    {
-                        if (!string.IsNullOrEmpty(att.AttachmentId))
-                            attachmentId = att.AttachmentId;
-                    }
-                }
-            }
-            return attachmentId;
-        }
-
-        //  Test are disabled because not all acounts are subscribed to AWS Support
-        //        [TestMethod]
-        public void TestDescribeServices()
-        {
-            var services = Client.DescribeServices().Services;
-            Assert.IsTrue(services.Count > 0);
-            Assert.IsNotNull(services[0].Code);
-            Assert.IsNotNull(services[0].Name);
-            Assert.IsTrue(services[0].Categories.Count > 0);
-            Assert.IsNotNull(services[0].Categories[0].Code);
-            Assert.IsNotNull(services[0].Categories[0].Name);
-
-            services = Client.DescribeServices(new DescribeServicesRequest { ServiceCodeList = new List<string> { SERVICE_CODE } }).Services;
-            Assert.AreEqual(1, services.Count);
-            Assert.IsNotNull(services[0].Name);
-            Assert.AreEqual(SERVICE_CODE, services[0].Code);
-        }
-
-        //  Test are disabled because not all acounts are subscribed to AWS Support
-        //       [TestMethod]
-        public void TestSeverityLevels()
-        {
-            var levels = Client.DescribeSeverityLevels().SeverityLevels;
-            Assert.IsTrue(levels.Count > 0);
-            Assert.IsNotNull(levels[0].Name);
-            Assert.IsNotNull(levels[0].Code);
-        }
-
-        //  Test are disabled because not all acounts are subscribed to AWS Support
-        //       [TestMethod]
-        public void TestTrustedAdvisorChecks()
-        {
-            var checks = Client.DescribeTrustedAdvisorChecks(new DescribeTrustedAdvisorChecksRequest { Language = LANGUAGE }).Checks;
-            Assert.IsTrue(checks.Count > 0);
-
-            var checkId = checks[0].Id;
-            Assert.IsNotNull(checks[0].Name);
-            Assert.IsNotNull(checks[0].Category);
-            Assert.IsNotNull(checks[0].Description);
-            Assert.IsTrue(checks[0].Metadata.Count > 0);
-            Assert.IsNotNull(checks[0].Metadata[0]);
-
-            var statuses = Client.DescribeTrustedAdvisorCheckRefreshStatuses(new DescribeTrustedAdvisorCheckRefreshStatusesRequest { CheckIds = new List<string> { checkId } })
-                .Statuses;
-
-            Assert.AreEqual(1, statuses.Count);
-            Assert.AreEqual(checkId, statuses[0].CheckId);
-            Assert.IsNotNull(statuses[0].Status);
-            Assert.IsNotNull(statuses[0].MillisUntilNextRefreshable);
-
-            var status = Client.RefreshTrustedAdvisorCheck(new RefreshTrustedAdvisorCheckRequest { CheckId = checkId }).Status;
-            Assert.IsNotNull(status);
-
-            var summaries = Client.DescribeTrustedAdvisorCheckSummaries(new DescribeTrustedAdvisorCheckSummariesRequest { CheckIds = new List<string> { checkId } })
-                .Summaries;
-
-            Assert.AreEqual(1, summaries.Count);
-            Assert.AreEqual(checkId, summaries[0].CheckId);
-            Assert.IsNotNull(summaries[0].Status);
-            Assert.IsNotNull(summaries[0].Timestamp);
-            Assert.IsNotNull(summaries[0].ResourcesSummary);
-            Assert.IsNotNull(summaries[0].CategorySpecificSummary);
-
-            var resultresult = Client.DescribeTrustedAdvisorCheckResult(new DescribeTrustedAdvisorCheckResultRequest { CheckId = checkId })
-                .Result;
-
-            Assert.IsNotNull(resultresult.Timestamp);
-            Assert.IsNotNull(resultresult.Status);
-            Assert.IsNotNull(resultresult.ResourcesSummary);
-        }
-    }
-}
diff --git a/sdk/test/Services/AWSSupport/IntegrationTests/Config/462/App.config b/sdk/test/Services/AWSSupport/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/AWSSupport/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/AWSSDK.IntegrationTests.ApplicationDiscoveryService.NetFramework.csproj b/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/AWSSDK.IntegrationTests.ApplicationDiscoveryService.NetFramework.csproj
deleted file mode 100644
index dec6d4c88fa3..000000000000
--- a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/AWSSDK.IntegrationTests.ApplicationDiscoveryService.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ApplicationDiscoveryService.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ApplicationDiscoveryService.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ApplicationDiscoveryService/AWSSDK.ApplicationDiscoveryService.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/APIGateway/AWSSDK.APIGateway.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/ApplicationDiscoveryServiceTests.cs b/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/ApplicationDiscoveryServiceTests.cs
deleted file mode 100644
index bb8c1ed48e97..000000000000
--- a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/ApplicationDiscoveryServiceTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.Runtime;
-using Amazon.ApplicationDiscoveryService;
-using Amazon.ApplicationDiscoveryService.Model;
-using Amazon;
-using System.IO;
-using System.Text;
-using Amazon.APIGateway.Model;
-using Amazon.APIGateway;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ApplicationDiscoveryServiceTests : TestBase<AmazonApplicationDiscoveryServiceClient>
-    {
-        [TestMethod]
-        [TestCategory("ApplicationDiscoveryService")]
-        public void TestListConfigurations()
-        {
-            IAmazonApplicationDiscoveryService client = new AmazonApplicationDiscoveryServiceClient(RegionEndpoint.USWest2);
-            try
-            {
-                ListConfigurationsRequest request = new ListConfigurationsRequest { ConfigurationType = ConfigurationItemType.PROCESS };
-                ListConfigurationsResponse response = client.ListConfigurations(request);
-                Assert.IsNotNull(response.ResponseMetadata.RequestId);
-            }
-            catch (AmazonApplicationDiscoveryServiceException e)
-            {
-                // We're really just making sure we can contact this service.
-                // So an error from the service that the account isn't whitelisted is acceptable.
-                if (!e.Message.Contains("is not whitelisted to access"))
-                    throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/Config/462/App.config b/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ApplicationDiscoveryService/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/AutoScaling/IntegrationTests/AWSSDK.IntegrationTests.AutoScaling.NetFramework.csproj b/sdk/test/Services/AutoScaling/IntegrationTests/AWSSDK.IntegrationTests.AutoScaling.NetFramework.csproj
deleted file mode 100644
index 675f74d28071..000000000000
--- a/sdk/test/Services/AutoScaling/IntegrationTests/AWSSDK.IntegrationTests.AutoScaling.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.AutoScaling.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.AutoScaling.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/AutoScaling/AWSSDK.AutoScaling.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/EC2/AWSSDK.EC2.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/AutoScaling/IntegrationTests/AutoScaling.cs b/sdk/test/Services/AutoScaling/IntegrationTests/AutoScaling.cs
deleted file mode 100644
index 6b3649db61d4..000000000000
--- a/sdk/test/Services/AutoScaling/IntegrationTests/AutoScaling.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Amazon.IdentityManagement.Model;
-using Amazon.Runtime;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.EC2;
-using Amazon.AutoScaling;
-using Amazon.AutoScaling.Model;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class AutoScaling : TestBase<AmazonAutoScalingClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void DescribeAccountLimitsTest()
-        {
-            var response = Client.DescribeAccountLimits();
-            var result = response;
-            Assert.IsNotNull(response);
-            Assert.IsNotNull(response.ResponseMetadata);
-            Assert.IsNotNull(response.ResponseMetadata.RequestId);
-            Assert.IsNotNull(result);
-            Assert.AreNotEqual(0, result.MaxNumberOfAutoScalingGroups);
-            Assert.AreNotEqual(0, result.MaxNumberOfLaunchConfigurations);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeAutoScalingGroupsTest()
-        {
-            var response = Client.DescribeAutoScalingGroups();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribePoliciesTest()
-        {
-            var response = Client.DescribePolicies();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeScalingProcessTypesTest()
-        {
-            var response = Client.DescribeScalingProcessTypes();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeScalingActivitiesTest()
-        {
-            var response = Client.DescribeScalingActivities();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeNotificationConfigurationsTest()
-        {
-            var response = Client.DescribeNotificationConfigurations();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeAutoScalingNotificationTypesTest()
-        {
-            var response = Client.DescribeAutoScalingNotificationTypes();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeAutoScalingInstancesTest()
-        {
-            var response = Client.DescribeAutoScalingInstances();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeLaunchConfigurationsTest()
-        {
-            var response = Client.DescribeLaunchConfigurations();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeAdjustmentTypesTest()
-        {
-            var response = Client.DescribeAdjustmentTypes();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeScheduledActionsTest()
-        {
-            var response = Client.DescribeScheduledActions();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeMetricCollectionTypesTest()
-        {
-            var response = Client.DescribeMetricCollectionTypes();
-            Assert.IsNotNull(response);
-        }
-
-        [TestMethod]
-        [TestCategory("AutoScaling")]
-        public void NoParamDescribeTerminationTests()
-        {
-            var response = Client.DescribeTerminationPolicyTypes();
-            Assert.IsTrue(response.TerminationPolicyTypes.Count > 0);
-        }
-
-        private static bool ActivitiesPending(IEnumerable<Activity> activities)
-        {
-            return activities.All(activity => !activity.StatusCode.Equals(ScalingActivityStatusCode.Cancelled) 
-                                        && !activity.StatusCode.Equals(ScalingActivityStatusCode.Failed) 
-                                        && !activity.StatusCode.Equals(ScalingActivityStatusCode.Successful));
-        }
-    }
-}
diff --git a/sdk/test/Services/AutoScaling/IntegrationTests/Config/462/App.config b/sdk/test/Services/AutoScaling/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/AutoScaling/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/BedrockRuntime/IntegrationTests/AWSSDK.IntegrationTests.BedrockRuntime.NetFramework.csproj b/sdk/test/Services/BedrockRuntime/IntegrationTests/AWSSDK.IntegrationTests.BedrockRuntime.NetFramework.csproj
deleted file mode 100644
index a4963c037da2..000000000000
--- a/sdk/test/Services/BedrockRuntime/IntegrationTests/AWSSDK.IntegrationTests.BedrockRuntime.NetFramework.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net472</TargetFramework>
-		<DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-		<DebugType>portable</DebugType>
-		<GenerateDocumentationFile>false</GenerateDocumentationFile>
-		<AssemblyName>AWSSDK.IntegrationTests.BedrockRuntime.NetFramework</AssemblyName>
-		<PackageId>AWSSDK.IntegrationTests.BedrpckRuntime.NetFramework</PackageId>
-
-		<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-		<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-		<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-		<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-		<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-		<NoWarn>CS1591</NoWarn>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Compile Remove="**/35/**" />
-		<None Remove="**/35/**" />
-		<Compile Remove="**/obj/**" />
-		<None Remove="**/obj/**" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-		<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-		<ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-		<ProjectReference Include="../../../../src/Services/BedrockRuntime/AWSSDK.BedrockRuntime.NetFramework.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Reference Include="System.Configuration" />
-		<Reference Include="System.ComponentModel.DataAnnotations" />
-		<Reference Include="System.IO.Compression" />
-		<Reference Include="System.Web" />
-	</ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/BedrockRuntime/IntegrationTests/BedrockRuntimeEventStreamTests.cs b/sdk/test/Services/BedrockRuntime/IntegrationTests/BedrockRuntimeEventStreamTests.cs
deleted file mode 100644
index b5205a18466d..000000000000
--- a/sdk/test/Services/BedrockRuntime/IntegrationTests/BedrockRuntimeEventStreamTests.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Amazon.BedrockRuntime;
-using Amazon.BedrockRuntime.Model;
-using System.Threading.Tasks;
-using System.IO;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System;
-using System.Diagnostics.Contracts;
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    /// <summary>
-    /// To run these tests on your local development acccount, you need to request access to the bedrock models
-    /// 1. Go to AWS console.
-    /// 2. Type Bedrock in the search bar
-    /// 3. Select Model Access in the left hand side menu
-    /// 4. Click Manage model access
-    /// 5. Select all models and request access.
-    /// 
-    /// Because this test requires explicit access to the models it is ignored.
-    /// </summary>
-    [TestClass]
-    [Ignore]
-    public class BedrockRuntimeEventStreamTests : TestBase<AmazonBedrockRuntimeClient>
-    {
-#if BCL
-        [TestMethod]
-        public async Task PayloadIsSentBackCorrectlyAsync()
-        {
-            AutoResetEvent endEvent = new AutoResetEvent(false);
-            var query = CreateStream("Who was the first US president");
-            var response = await Client.InvokeModelWithResponseStreamAsync(new InvokeModelWithResponseStreamRequest
-            {
-                Accept = "*/*",
-                ContentType = "application/json",
-                Body = query,
-                ModelId = "anthropic.claude-v2"
-            }).ConfigureAwait(false);
-            var eventStream = response.Body;
-            Assert.IsNotNull(eventStream);
-            Assert.AreEqual(response.HttpStatusCode, System.Net.HttpStatusCode.OK);
-            string payloadString = null;
-            using (eventStream)
-            {
-                eventStream.ChunkReceived += (sender, e) =>
-                {
-                    var sizeOfPayload = e.EventStreamEvent.Bytes.Length;
-                    using (StreamReader r = new StreamReader(e.EventStreamEvent.Bytes))
-                    {
-                        payloadString = r.ReadToEnd();
-                    }
-                    //Since we don't know the contents of the response from Bedrock, we just assert that we received a payload
-                    //and that the size of the payload is equal to what we read from the stream
-                    var payloadStringSize = Encoding.UTF8.GetByteCount(payloadString);
-                    Assert.IsNotNull(payloadString);
-                    Assert.AreEqual(payloadStringSize, sizeOfPayload);
-                    endEvent.Set();
-                };
-                eventStream.StartProcessing();
-                //the maximum we will wait for a response is 20 seconds, if a payload chunk is received
-                //we signal the end event and exit the test.We are purposely not waiting for the full response
-                //because it will take too much time. We just check the first streamed payload.
-                endEvent.WaitOne(TimeSpan.FromSeconds(20));
-            }
-        }
-        [TestMethod]
-        public async Task RequestWithInvalidBodyReturnsValidationException()
-        {
-            AutoResetEvent endEvent = new AutoResetEvent(false);
-            var query = CreateStream("Who was the first US president", true);
-            var response = await Client.InvokeModelWithResponseStreamAsync(new InvokeModelWithResponseStreamRequest
-            {
-                Accept = "*/*",
-                ContentType = "application/json",
-                Body = query,
-                ModelId = "anthropic.claude-v2"
-            }).ConfigureAwait(false);
-            var eventStream = response.Body;
-            Assert.IsNotNull(eventStream);
-            Assert.AreEqual(response.HttpStatusCode, System.Net.HttpStatusCode.OK);
-            bool chunkReceived = false;
-            bool exceptionReceived = false;
-            using (eventStream)
-            {
-                eventStream.ChunkReceived += (sender, e) =>
-                {
-                    chunkReceived = true;
-                    endEvent.Set();
-                };
-                eventStream.ExceptionReceived += (sender, e) =>
-                {
-                    exceptionReceived = true;
-                    var actualException = e.EventStreamException.InnerException;
-                    Assert.IsInstanceOfType(e.EventStreamException.InnerException, typeof(ValidationException));
-                    endEvent.Set();
-                };
-                eventStream.StartProcessing();
-
-                endEvent.WaitOne(TimeSpan.FromSeconds(20));
-            }
-            Assert.IsTrue(exceptionReceived);
-            Assert.IsFalse(chunkReceived);
-        }
-#endif
-        static MemoryStream CreateStream(string query, bool createInvalidInput = false)
-        {
-            StringBuilder promptValueBuilder = new StringBuilder();
-            if (createInvalidInput)
-                promptValueBuilder.Append("INVALID INPUT QWEOASDASD");
-            promptValueBuilder.Append("Human: ");
-            promptValueBuilder.Append(query);
-            if (!query.EndsWith("."))
-                promptValueBuilder.Append(".");
-            promptValueBuilder.AppendLine();
-            promptValueBuilder.AppendLine("Assistant: ");
-            MemoryStream stream = new MemoryStream();
-            AnthropicClaudeV2Json jsonObject = new AnthropicClaudeV2Json
-            {
-                prompt = promptValueBuilder.ToString(),
-                max_tokens_to_sample = 300
-            };
-            JsonSerializer.Serialize(stream, jsonObject, typeof(AnthropicClaudeV2Json));
-
-            stream.Position = 0;
-            return stream;
-        }
-        private class AnthropicClaudeV2Json
-        {
-            public string prompt { get; set; }
-            public int max_tokens_to_sample { get; set; }
-        }
-    }
-}
-
diff --git a/sdk/test/Services/CertificateManager/IntegrationTests/AWSSDK.IntegrationTests.CertificateManager.NetFramework.csproj b/sdk/test/Services/CertificateManager/IntegrationTests/AWSSDK.IntegrationTests.CertificateManager.NetFramework.csproj
deleted file mode 100644
index d1ab68105350..000000000000
--- a/sdk/test/Services/CertificateManager/IntegrationTests/AWSSDK.IntegrationTests.CertificateManager.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CertificateManager.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CertificateManager.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CertificateManager/AWSSDK.CertificateManager.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CertificateManager/IntegrationTests/CertificateManager.cs b/sdk/test/Services/CertificateManager/IntegrationTests/CertificateManager.cs
deleted file mode 100644
index 30426765e9e3..000000000000
--- a/sdk/test/Services/CertificateManager/IntegrationTests/CertificateManager.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon;
-using Amazon.CertificateManager;
-using Amazon.CertificateManager.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CertificateManagerTests : TestBase<Amazon.CertificateManager.AmazonCertificateManagerClient>
-    {
-        [ClassCleanup]
-        public static void ClassCleanup()
-        {
-            BaseClean();
-        }
-
-
-        [ClassInitialize]
-        public static void ClassInitialize(TestContext testContext)
-        {
-        }
-
-        [TestMethod]
-        [TestCategory("CertificateManager")]
-        public void TestListCertificates()
-        {
-            var response = Client.ListCertificates();
-            Assert.IsNotNull(response);
-
-            if (response.CertificateSummaryList.Any())
-            {
-                foreach (var c in response.CertificateSummaryList)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(c.CertificateArn));
-                    Assert.IsFalse(string.IsNullOrEmpty(c.DomainName));
-                }
-            }
-        }
-
-    }
-}
diff --git a/sdk/test/Services/CertificateManager/IntegrationTests/Config/462/App.config b/sdk/test/Services/CertificateManager/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CertificateManager/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudDirectory/IntegrationTests/AWSSDK.IntegrationTests.CloudDirectory.NetFramework.csproj b/sdk/test/Services/CloudDirectory/IntegrationTests/AWSSDK.IntegrationTests.CloudDirectory.NetFramework.csproj
deleted file mode 100644
index b5ad8515b97e..000000000000
--- a/sdk/test/Services/CloudDirectory/IntegrationTests/AWSSDK.IntegrationTests.CloudDirectory.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudDirectory.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudDirectory.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudDirectory/AWSSDK.CloudDirectory.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ECR/AWSSDK.ECR.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudDirectory/IntegrationTests/CloudDirectory.cs b/sdk/test/Services/CloudDirectory/IntegrationTests/CloudDirectory.cs
deleted file mode 100644
index fd94d0a9fa45..000000000000
--- a/sdk/test/Services/CloudDirectory/IntegrationTests/CloudDirectory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Amazon;
-using Amazon.ECR;
-using Amazon.ECR.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Amazon.CloudDirectory;
-using Amazon.CloudDirectory.Model;
-using AWSSDK_DotNet.CommonTest.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CloudDirectory : TestBase<AmazonCloudDirectoryClient>
-    {
-        private const string ListObjectAttributesResponse = @"{""Attributes"":[{""Key"":{""FacetName"":""Person"",""Name"":""username"",""SchemaArn"":""arn:aws:clouddirectory:us-east-1:123456789012:directory/AQPCHP0oaUPOoPHKMr1kMTs/schema/person/1""},""Value"":{""BinaryValue"":null,""BooleanValue"":null,""DatetimeValue"":null,""NumberValue"":null,""StringValue"":""bob""}}],""NextToken"":null}";
-
-        [TestMethod]
-        [TestCategory("CloudDirectory")]
-        public void TestAttributes()
-        {
-            using(var servlet = new ResponseTestServlet())
-            {
-                servlet.Response = ListObjectAttributesResponse;
-
-                var config = new AmazonCloudDirectoryConfig { ServiceURL = servlet.ServiceURL };
-                using(var client = new AmazonCloudDirectoryClient(config))
-                {
-                    var response = client.ListObjectAttributes(new ListObjectAttributesRequest());
-
-                    var attribute = response.Attributes.SingleOrDefault();
-                    Assert.IsNotNull(attribute);
-
-                    var key = attribute.Key;
-                    Assert.IsNotNull(key);
-
-                    Assert.AreEqual("Person", key.FacetName);
-                    Assert.AreEqual("username", key.Name);
-                    Assert.AreEqual("arn:aws:clouddirectory:us-east-1:123456789012:directory/AQPCHP0oaUPOoPHKMr1kMTs/schema/person/1", key.SchemaArn);
-
-                    var value = attribute.Value;
-                    Assert.IsNotNull(value);
-
-                    Assert.IsNull(value.BinaryValue);
-                    Assert.IsFalse(value.BooleanValue.HasValue);
-                    Assert.IsNull(value.DatetimeValue);
-                    Assert.IsNull(value.NumberValue);
-                    Assert.AreEqual("bob", value.StringValue);
-                }
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/CloudDirectory/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudDirectory/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudDirectory/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudFront/IntegrationTests/AWSSDK.IntegrationTests.CloudFront.NetFramework.csproj b/sdk/test/Services/CloudFront/IntegrationTests/AWSSDK.IntegrationTests.CloudFront.NetFramework.csproj
deleted file mode 100644
index 05285938add8..000000000000
--- a/sdk/test/Services/CloudFront/IntegrationTests/AWSSDK.IntegrationTests.CloudFront.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudFront.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudFront.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudFront/AWSSDK.CloudFront.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudFront/IntegrationTests/CloudFront.cs b/sdk/test/Services/CloudFront/IntegrationTests/CloudFront.cs
deleted file mode 100644
index e2910162260d..000000000000
--- a/sdk/test/Services/CloudFront/IntegrationTests/CloudFront.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.CloudFront;
-using Amazon.CloudFront.Model;
-using Amazon.S3.Model;
-using Amazon.IdentityManagement.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CloudFront : TestBase<AmazonCloudFrontClient>
-    {
-        [TestMethod]
-        [TestCategory("CloudFront")]
-        public void ListDistributions()
-        {
-            var response = Client.ListDistributions();
-            Assert.IsNotNull(response.DistributionList);
-        }
-
-        [TestMethod]
-        [TestCategory("CloudFront")]
-        public void OriginTests()
-        {
-            var createRequest = new CreateCloudFrontOriginAccessIdentityRequest()
-            {
-                CloudFrontOriginAccessIdentityConfig = new CloudFrontOriginAccessIdentityConfig()
-                {
-                    CallerReference = Guid.NewGuid().ToString(),
-                    Comment = UtilityMethods.SDK_TEST_PREFIX
-                }
-            };
-            var createResponse = Client.CreateCloudFrontOriginAccessIdentity(createRequest);
-            Assert.IsNotNull(createResponse.ETag);
-            Assert.IsNotNull(createResponse.CloudFrontOriginAccessIdentity.Id);
-
-            var updateRequest = new UpdateCloudFrontOriginAccessIdentityRequest()
-            {
-                CloudFrontOriginAccessIdentityConfig = new CloudFrontOriginAccessIdentityConfig()
-                {
-                    CallerReference = createRequest.CloudFrontOriginAccessIdentityConfig.CallerReference,
-                    Comment = UtilityMethods.SDK_TEST_PREFIX + "update"
-                },
-                Id = createResponse.CloudFrontOriginAccessIdentity.Id,
-                IfMatch = createResponse.ETag
-            };
-            var updateResponse = Client.UpdateCloudFrontOriginAccessIdentity(updateRequest);
-            Assert.IsNotNull(updateResponse.ETag);
-            Assert.IsNotNull(updateResponse.CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig.Comment);
-
-
-            var listResponse = Client.ListCloudFrontOriginAccessIdentities();
-            Assert.IsTrue(listResponse.CloudFrontOriginAccessIdentityList.Items.Count > 0);
-
-            var deleteRequest = new DeleteCloudFrontOriginAccessIdentityRequest()
-            {
-                Id = createResponse.CloudFrontOriginAccessIdentity.Id,
-                IfMatch = updateResponse.ETag
-            };
-            var deleteResponse = Client.DeleteCloudFrontOriginAccessIdentity(deleteRequest);
-            Assert.IsNotNull(deleteResponse.ResponseMetadata.RequestId);
-        }
-    }
-}
diff --git a/sdk/test/Services/CloudFront/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudFront/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudFront/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudHSM/IntegrationTests/AWSSDK.IntegrationTests.CloudHSM.NetFramework.csproj b/sdk/test/Services/CloudHSM/IntegrationTests/AWSSDK.IntegrationTests.CloudHSM.NetFramework.csproj
deleted file mode 100644
index 91aea634f4b1..000000000000
--- a/sdk/test/Services/CloudHSM/IntegrationTests/AWSSDK.IntegrationTests.CloudHSM.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudHSM.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudHSM.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudHSM/AWSSDK.CloudHSM.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudHSM/IntegrationTests/CloudHSM.cs b/sdk/test/Services/CloudHSM/IntegrationTests/CloudHSM.cs
deleted file mode 100644
index 6b7e1df5e177..000000000000
--- a/sdk/test/Services/CloudHSM/IntegrationTests/CloudHSM.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using System.Linq;
-
-using Amazon;
-using Amazon.CloudHSM;
-using Amazon.CloudHSM.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [Ignore("CloudHSM classic is not available to newly created AWS accounts.")]
-    [TestClass]
-    public class CloudHSM : TestBase<AmazonCloudHSMClient>
-    {
-        [TestMethod]
-        [TestCategory("CloudHSM")]
-        public void TestSimpleMethods()
-        {
-            var zones = Client.ListAvailableZones().AZList;
-            Assert.IsNotNull(zones);
-            Assert.IsTrue(zones.Count > 0);
-            var hsms = Client.ListHsms().HsmList;
-            Assert.IsNotNull(hsms);
-        }
-
-        [TestMethod]
-        [TestCategory("CloudHSM")]
-        public void TestHapg()
-        {
-            var arn = Client.CreateHapg(new CreateHapgRequest { Label = Utils.UtilityMethods.GenerateName() }).HapgArn;
-            Assert.IsNotNull(arn);
-
-            var hapgs = Client.ListHapgs().HapgList;
-            Assert.IsTrue(hapgs.Contains(arn));
-
-            var status = Client.DeleteHapg(arn).Status;
-
-            Assert.IsNotNull(status);
-        }
-    }
-}
diff --git a/sdk/test/Services/CloudHSM/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudHSM/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudHSM/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudTrail/IntegrationTests/AWSSDK.IntegrationTests.CloudTrail.NetFramework.csproj b/sdk/test/Services/CloudTrail/IntegrationTests/AWSSDK.IntegrationTests.CloudTrail.NetFramework.csproj
deleted file mode 100644
index 72726e981caf..000000000000
--- a/sdk/test/Services/CloudTrail/IntegrationTests/AWSSDK.IntegrationTests.CloudTrail.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudTrail.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudTrail.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudTrail/AWSSDK.CloudTrail.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs b/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs
deleted file mode 100644
index 26aae1cffc2f..000000000000
--- a/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.CloudTrail;
-using Amazon.CloudTrail.Model;
-
-using Amazon.S3;
-using Amazon.S3.Model;
-using Amazon.S3.Util;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CloudTrail : TestBase<AmazonCloudTrailClient>
-    {
-        private static string _trailStorageBucketName = "sdk-dotnet-integ-test-trail-bucket-" + DateTime.UtcNow.Ticks;
-        private const string S3_PREFIX = "folder";
-
-        static AmazonS3Client s3Client;
-
-        [ClassInitialize]
-        public static void ClassInitialize(TestContext testContext)
-        {
-            s3Client = new AmazonS3Client();
-            try
-            {
-                AmazonS3Util.DeleteS3BucketWithObjects(s3Client, _trailStorageBucketName);
-            }
-            catch (Exception) { }
-
-            s3Client.PutBucket(new PutBucketRequest
-            {
-                BucketName = _trailStorageBucketName,
-                CannedACL = S3CannedACL.BucketOwnerFullControl
-            });
-
-            var policy = UtilityMethods.GetResourceText("CloudTrailBucketPolicy.json");
-
-            // Inject newly created bucket and current account id
-            policy = policy.Replace("{BucketName}", _trailStorageBucketName)
-                .Replace("{Prefix}", S3_PREFIX)
-                .Replace("{AccountId}", UtilityMethods.AccountId);
-
-            s3Client.PutBucketPolicy(new PutBucketPolicyRequest
-            {
-                BucketName = _trailStorageBucketName,
-                Policy = policy
-            });
-        }
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            var trails = Client.DescribeTrails();
-            foreach (var trail in trails.TrailList)
-            {
-                if (trail.Name.Contains("dotnet-integ-test"))
-                {
-                    Client.DeleteTrail(new DeleteTrailRequest
-                    {
-                        Name = trail.Name
-                    });
-                }
-            }
-
-            AmazonS3Util.DeleteS3BucketWithObjects(s3Client, _trailStorageBucketName);
-
-            BaseClean();
-
-            s3Client.Dispose();
-            s3Client = null;
-        }
-
-        [TestMethod]
-        [TestCategory("CloudTrail")]
-        public void CloudTrailIntegrationTest()
-        {
-            var trailsCount = Client.DescribeTrails().
-                TrailList.Count;
-
-            // Cloud Trail is already setup for this account so skip the test to not disturb
-            // the settings.
-            if (trailsCount != 0)
-                return;
-
-            var trailName = "dotnet-integ-test-trail-" + DateTime.UtcNow.Ticks;
-            var trail = Client.CreateTrail(new CreateTrailRequest
-            {
-                Name = trailName,
-                IncludeGlobalServiceEvents = true,
-                S3BucketName = _trailStorageBucketName,
-                S3KeyPrefix = S3_PREFIX
-            });
-            Assert.AreEqual(trail.Name, trailName);
-            Assert.AreEqual(trail.IncludeGlobalServiceEvents, true);
-            Assert.AreEqual(trail.S3BucketName, _trailStorageBucketName);
-            Assert.AreEqual(trail.S3KeyPrefix, S3_PREFIX);
-            Assert.AreEqual(trail.SnsTopicName, null);
-            Thread.Sleep(TimeSpan.FromSeconds(5));
-
-            var trails = Client.DescribeTrails().
-                TrailList;
-            Assert.AreEqual(trails.Count, trailsCount + 1);
-
-            var trailStatus = Client.GetTrailStatus(new GetTrailStatusRequest
-            {
-                Name = trailName
-            });
-            Assert.AreEqual(trailStatus.IsLogging, false);
-
-            Client.StartLogging(new StartLoggingRequest
-            {
-                Name = trailName
-            });
-            Thread.Sleep(TimeSpan.FromSeconds(5));
-
-            trailStatus = Client.GetTrailStatus(new GetTrailStatusRequest
-            {
-                Name = trailName
-            });
-            Assert.AreEqual(trailStatus.IsLogging, true);
-
-            var endTime = DateTime.UtcNow;
-            var startTime = endTime.AddMinutes(-30);
-
-            var request = new LookupEventsRequest
-            {
-                StartTime = startTime,
-                EndTime = endTime,
-            };
-            var allEvents = LookupAllEvents(request).ToList();
-
-            if (allEvents.Count > 0)
-            {
-                var resourceNamesMap = new Dictionary<string, int>();
-                foreach (var e in allEvents)
-                {
-                    var resources = e.Resources;
-                    foreach (var r in resources)
-                    {
-                        if (!resourceNamesMap.ContainsKey(r.ResourceName))
-                            resourceNamesMap[r.ResourceName] = 0;
-                        resourceNamesMap[r.ResourceName]++;
-                    }
-                }
-
-                var firstResourceNameKVP = resourceNamesMap.First();
-                request.LookupAttributes = new List<LookupAttribute>
-                {
-                    new LookupAttribute
-                    {
-                        AttributeKey = LookupAttributeKey.ResourceName,
-                        AttributeValue = firstResourceNameKVP.Key
-                    }
-                };
-                var filteredEvents = LookupAllEvents(request).ToList();
-                Assert.AreEqual(firstResourceNameKVP.Value, filteredEvents.Count);
-            }
-
-            Client.StopLogging(new StopLoggingRequest
-            {
-                Name = trailName
-            });
-            Thread.Sleep(TimeSpan.FromSeconds(2));
-
-            Client.DeleteTrail(new DeleteTrailRequest
-            {
-                Name = trailName
-            });
-        }
-
-        private IEnumerable<Event> LookupAllEvents(LookupEventsRequest request = null)
-        {
-            if (request == null)
-                request = new LookupEventsRequest();
-            do
-            {
-                var result = Client.LookupEvents(request);
-                request.NextToken = result.NextToken;
-
-                var events = result.Events;
-                foreach (var e in events)
-                    yield return e;
-
-            } while (!string.IsNullOrEmpty(request.NextToken));
-        }
-    }
-}
diff --git a/sdk/test/Services/CloudTrail/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudTrail/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudTrail/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudWatchEvents/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchEvents.NetFramework.csproj b/sdk/test/Services/CloudWatchEvents/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchEvents.NetFramework.csproj
deleted file mode 100644
index ee2254c0feff..000000000000
--- a/sdk/test/Services/CloudWatchEvents/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchEvents.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudWatchEvents.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudWatchEvents.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudWatchEvents/AWSSDK.CloudWatchEvents.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudWatchEvents/IntegrationTests/CloudWatchEvents.cs b/sdk/test/Services/CloudWatchEvents/IntegrationTests/CloudWatchEvents.cs
deleted file mode 100644
index e0b5ad300d23..000000000000
--- a/sdk/test/Services/CloudWatchEvents/IntegrationTests/CloudWatchEvents.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.CloudWatchEvents;
-using Amazon.CloudWatchEvents.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CloudWatchEvents : TestBase<AmazonCloudWatchEventsClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("CloudWatchEvents")]
-        public void TestCloudWatchEvents()
-        {
-            var rules = Client.ListRules().Rules;
-
-            Assert.IsTrue(rules != null);
-
-            string ruleName = UtilityMethods.GenerateName("CloudWatchEventRule");
-
-            var exception = AssertExtensions.ExpectException<ResourceNotFoundException>(() =>
-                Client.DescribeRule(new DescribeRuleRequest { Name = ruleName }));
-                        
-            try
-            {
-                var createRuleResponse = Client.PutRule(new PutRuleRequest
-                {
-                    Name = ruleName,
-                    State = RuleState.ENABLED,
-                    ScheduleExpression = "rate(5 minutes)"
-                    
-                });
-
-                Assert.IsFalse(string.IsNullOrEmpty(createRuleResponse.RuleArn));
-            }
-            finally
-            {
-                Client.DeleteRule(new DeleteRuleRequest
-                {
-                    Name = ruleName
-                });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/Services/CloudWatchEvents/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudWatchEvents/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudWatchEvents/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CloudWatchLogs/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchLogs.NetFramework.csproj b/sdk/test/Services/CloudWatchLogs/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchLogs.NetFramework.csproj
deleted file mode 100644
index de8976c36b00..000000000000
--- a/sdk/test/Services/CloudWatchLogs/IntegrationTests/AWSSDK.IntegrationTests.CloudWatchLogs.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CloudWatchLogs.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CloudWatchLogs.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CloudWatchLogs/AWSSDK.CloudWatchLogs.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs b/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs
deleted file mode 100644
index 5fa0ab83e943..000000000000
--- a/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.CloudWatchLogs;
-using Amazon.CloudWatchLogs.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CloudWatchLogs : TestBase<AmazonCloudWatchLogsClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("CloudWatchLogs")]
-        public void CRUDLogGroup()
-        {
-            var logGroupName = "sdk-dotnet-" + DateTime.UtcNow.Ticks;
-            Client.CreateLogGroup(new CreateLogGroupRequest
-            {
-                LogGroupName = logGroupName
-            });
-            try
-            {
-                {
-                    DescribeLogGroupsResponse response = Client.DescribeLogGroups(new DescribeLogGroupsRequest
-                        {
-                            LogGroupNamePrefix = logGroupName
-                        });
-
-                    Assert.AreEqual(1, response.LogGroups.Count);
-                    Assert.IsNotNull(response.LogGroups[0].Arn);
-                    Assert.IsNull(response.LogGroups[0].RetentionInDays);
-
-                    Client.PutRetentionPolicy(new PutRetentionPolicyRequest
-                        {
-                            LogGroupName = logGroupName,
-                            RetentionInDays = 1
-                        });
-
-                    response = Client.DescribeLogGroups(new DescribeLogGroupsRequest
-                    {
-                        LogGroupNamePrefix = logGroupName
-                    });
-
-                    Assert.AreEqual(1, response.LogGroups.Count);
-                    Assert.AreEqual(1, response.LogGroups[0].RetentionInDays.GetValueOrDefault());
-                }
-
-                {
-                    Client.CreateLogStream(new CreateLogStreamRequest
-                        {
-                            LogGroupName = logGroupName,
-                            LogStreamName = "sample"
-                        });
-
-                    DescribeLogStreamsResponse describeResponse = Client.DescribeLogStreams(new DescribeLogStreamsRequest
-                        {
-                            LogGroupName = logGroupName,
-                            LogStreamNamePrefix = "sample"
-                        });
-
-                    Assert.AreEqual(1, describeResponse.LogStreams.Count);
-                    Assert.IsNotNull(describeResponse.LogStreams[0].Arn);
-
-                    PutLogEventsResponse putResponse1 = Client.PutLogEvents(new PutLogEventsRequest
-                        {
-                            LogGroupName = logGroupName,
-                            LogStreamName = "sample",
-                            LogEvents = new List<InputLogEvent>
-                            {
-                                new InputLogEvent
-                                {
-                                    Message = "First Data",
-                                    Timestamp = DateTime.UtcNow
-                                }
-                            }
-                        });
-
-                    // Pad the time so the 2 events are not at the same time.
-                    Thread.Sleep(10);
-
-                    Client.PutLogEvents(new PutLogEventsRequest
-                    {
-                         SequenceToken = putResponse1.NextSequenceToken,
-                        LogGroupName = logGroupName,
-                        LogStreamName = "sample",
-                        LogEvents = new List<InputLogEvent>
-                            {
-                                new InputLogEvent
-                                {
-                                    Message = "Second Data",
-                                    Timestamp = DateTime.UtcNow
-                                }
-                            }
-                    });
-
-                    GetLogEventsResponse getResponse = null;
-
-                    // Doing this in a loop to wait for the eventual consistency of the events
-                    // being written to cloudwatch logs.
-                    for (int i = 0; i < 20; i++)
-                    {
-
-                        getResponse = Client.GetLogEvents(new GetLogEventsRequest
-                            {
-                                LogGroupName = logGroupName,
-                                LogStreamName = "sample",
-                                StartTime = DateTime.UtcNow.AddDays(-2),
-                                EndTime = DateTime.UtcNow
-                            });
-
-                        if (getResponse.Events.Count == 2)
-                            break;
-
-                        Thread.Sleep(1000 * 2);
-                    }
-
-                    Assert.AreEqual(2, getResponse.Events.Count);
-                    Assert.AreEqual("First Data", getResponse.Events[0].Message);
-                    Assert.AreEqual(DateTime.UtcNow.Date, getResponse.Events[0].Timestamp.Value.Date);
-
-                    Assert.AreEqual("Second Data", getResponse.Events[1].Message);
-                    Assert.AreEqual(DateTime.UtcNow.Date, getResponse.Events[1].Timestamp.Value.Date);
-
-                    Assert.IsTrue(getResponse.Events[0].Timestamp.Value < getResponse.Events[1].Timestamp.Value);
-
-
-                    Client.DeleteLogStream(new DeleteLogStreamRequest
-                        {
-                            LogGroupName = logGroupName,
-                            LogStreamName = "sample"
-                        });
-                }
-            }
-            finally
-            {
-                Client.DeleteLogGroup(new DeleteLogGroupRequest
-                    {
-                        LogGroupName = logGroupName
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/Services/CloudWatchLogs/IntegrationTests/Config/462/App.config b/sdk/test/Services/CloudWatchLogs/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CloudWatchLogs/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/CodeDeploy/IntegrationTests/AWSSDK.IntegrationTests.CodeDeploy.NetFramework.csproj b/sdk/test/Services/CodeDeploy/IntegrationTests/AWSSDK.IntegrationTests.CodeDeploy.NetFramework.csproj
deleted file mode 100644
index cc06e93815a3..000000000000
--- a/sdk/test/Services/CodeDeploy/IntegrationTests/AWSSDK.IntegrationTests.CodeDeploy.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.CodeDeploy.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.CodeDeploy.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/CodeDeploy/AWSSDK.CodeDeploy.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/CodeDeploy/IntegrationTests/CodeDeploy.cs b/sdk/test/Services/CodeDeploy/IntegrationTests/CodeDeploy.cs
deleted file mode 100644
index aef9460c500d..000000000000
--- a/sdk/test/Services/CodeDeploy/IntegrationTests/CodeDeploy.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Amazon;
-using Amazon.CodeDeploy;
-using Amazon.CodeDeploy.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class CodeDeploy : TestBase<AmazonCodeDeployClient>
-    {
-        [TestMethod]
-        [TestCategory("CodeDeploy")]
-        public void TestListApplications()
-        {
-            Client.ListApplications();
-        }
-
-        [TestMethod]
-        [TestCategory("CodeDeploy")]
-        public void TestCreateApplication()
-        {
-            var appName = Utils.UtilityMethods.GenerateName();
-            Client.CreateApplication(new CreateApplicationRequest { ApplicationName = appName });
-            Assert.IsTrue(Client.ListApplications().Applications.Contains(appName));
-            Client.DeleteApplication(new DeleteApplicationRequest { ApplicationName = appName });
-        }
-
-        [TestMethod]
-        [TestCategory("CodeDeploy")]
-        public void TestDeleteApplication()
-        {
-            var appName = Utils.UtilityMethods.GenerateName();
-            Client.CreateApplication(new CreateApplicationRequest { ApplicationName = appName });
-            Assert.IsTrue(Client.ListApplications().Applications.Contains(appName));
-            Client.DeleteApplication(new DeleteApplicationRequest { ApplicationName = appName });
-            Assert.IsFalse(Client.ListApplications().Applications.Contains(appName));
-        }
-    }
-}
diff --git a/sdk/test/Services/CodeDeploy/IntegrationTests/Config/462/App.config b/sdk/test/Services/CodeDeploy/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/CodeDeploy/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ConfigService/IntegrationTests/AWSSDK.IntegrationTests.ConfigService.NetFramework.csproj b/sdk/test/Services/ConfigService/IntegrationTests/AWSSDK.IntegrationTests.ConfigService.NetFramework.csproj
deleted file mode 100644
index b3f1a52cc0f3..000000000000
--- a/sdk/test/Services/ConfigService/IntegrationTests/AWSSDK.IntegrationTests.ConfigService.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ConfigService.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ConfigService.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ConfigService/AWSSDK.ConfigService.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ConfigService/IntegrationTests/Config/462/App.config b/sdk/test/Services/ConfigService/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ConfigService/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ConfigService/IntegrationTests/ConfigServiceTests.cs b/sdk/test/Services/ConfigService/IntegrationTests/ConfigServiceTests.cs
deleted file mode 100644
index 61b17a0aeb55..000000000000
--- a/sdk/test/Services/ConfigService/IntegrationTests/ConfigServiceTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-
-
-using Amazon.ConfigService;
-using Amazon.ConfigService.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ConfigServiceTests : TestBase<AmazonConfigServiceClient>
-    {
-        [TestMethod]
-        [TestCategory("ConfigService")]
-        public void TestDescribeConfigurationRecorderStatus()
-        {
-            Client.DescribeConfigurationRecorderStatus(new DescribeConfigurationRecorderStatusRequest
-            {
-
-            });
-        }
-
-
-    }
-}
diff --git a/sdk/test/Services/DataPipeline/IntegrationTests/AWSSDK.IntegrationTests.DataPipeline.NetFramework.csproj b/sdk/test/Services/DataPipeline/IntegrationTests/AWSSDK.IntegrationTests.DataPipeline.NetFramework.csproj
deleted file mode 100644
index a09d998d2d81..000000000000
--- a/sdk/test/Services/DataPipeline/IntegrationTests/AWSSDK.IntegrationTests.DataPipeline.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.DataPipeline.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.DataPipeline.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/DataPipeline/AWSSDK.DataPipeline.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/DataPipeline/IntegrationTests/Config/462/App.config b/sdk/test/Services/DataPipeline/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/DataPipeline/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs b/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs
deleted file mode 100644
index dba4a8d859e1..000000000000
--- a/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Amazon.DataPipeline;
-using Amazon.DataPipeline.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class DataPipeline : TestBase<AmazonDataPipelineClient>
-    {
-        [TestMethod]
-        [TestCategory("DataPipeline")]
-        public void TestListPipelines()
-        {
-            var response = Client.ListPipelines();
-            Assert.IsNotNull(response);
-
-            // if test a/c had some pipelines, iterate through
-            // to verify marshal
-            if (response.PipelineIdList.Count > 0)
-            {
-                foreach (var p in response.PipelineIdList)
-                {
-                    Assert.IsNotNull(p);
-                    Assert.IsFalse(string.IsNullOrEmpty(p.Id));
-                }
-            }
-        }
-
-        //[TestMethod]
-        [TestCategory("DataPipeline")]
-        public void TestPipelineOperations()
-        {
-            const string testPipelineName = "dotnet-test-pipeline";
-            const string testPipelineDescription = "dotnet test pipeline";
-            
-            var testPipelineId = "dotnet-test-pipeline" + DateTime.UtcNow.ToFileTime();
-
-            const string testObjectId = "123";
-            const string testObjectName = "object";
-
-            string createdPipelineId = null;
-
-            try
-            {
-                var createPipelineResult
-                    = Client.CreatePipeline(new CreatePipelineRequest
-                    {
-                        Name = testPipelineName,
-                        UniqueId = testPipelineId,
-                        Description = testPipelineDescription
-                    });
-                createdPipelineId = createPipelineResult.PipelineId;
-                Assert.IsNotNull(createdPipelineId);
-
-                var pipelineObject = new PipelineObject { Id = testObjectId, Name = testObjectName };
-                var field = new Field { Key = "workerGroup", StringValue = "dotnetsdk" };
-                pipelineObject.Fields = new List<Field> { field };
-
-                var putPipelineDefinitionResult
-                    = Client.PutPipelineDefinition(new PutPipelineDefinitionRequest
-                    {
-                        PipelineId = createdPipelineId,
-                        PipelineObjects = new List<PipelineObject> { pipelineObject }
-                    });
-                Assert.IsFalse(putPipelineDefinitionResult.Errored.Value);
-
-                var tags = new List<Tag>
-                {
-                    new Tag { Key = "tag1", Value = "42" },
-                    new Tag { Key = "tag2", Value = DateTime.UtcNow.ToString() }
-                };
-                Client.AddTags(createdPipelineId, tags);
-
-                var describeResult = Client.DescribePipelines(new List<string> { createdPipelineId }).PipelineDescriptionList;
-                Assert.AreEqual(1, describeResult.Count);
-                Assert.AreEqual(tags.Count, describeResult.First().Tags.Count);
-
-                Client.RemoveTags(createdPipelineId, new List<string> { "tag1" });
-
-                describeResult = Client.DescribePipelines(new List<string> { createdPipelineId }).PipelineDescriptionList;
-                Assert.AreEqual(1, describeResult.Count);
-                Assert.AreEqual(1, describeResult.First().Tags.Count);
-
-                var activatePipelineResult = Client.ActivatePipeline(new ActivatePipelineRequest
-                {
-                    PipelineId = createdPipelineId
-                });
-                Assert.IsNotNull(activatePipelineResult);
-
-                
-                var foundPipeline = false;
-                for (int retries = 0; retries < 5 && !foundPipeline; retries++)
-                {
-                    Thread.Sleep(1000 * retries);
-
-                    var listRequest = new ListPipelinesRequest();
-                    var listResponse = new ListPipelinesResponse();
-                    do
-                    {
-                        listRequest.Marker = listResponse.Marker;
-                        listResponse = Client.ListPipelines(listRequest);
-                        if (listResponse.PipelineIdList.Count > 0)
-                        {
-                            if (listResponse.PipelineIdList.Any(p => p.Id.Equals(createdPipelineId) && p.Name.Equals(testPipelineName)))
-                            {
-                                foundPipeline = true;
-                                break;
-                            }
-                        }
-                    } while (!string.IsNullOrEmpty(listResponse.Marker));
-                }
-                Assert.IsTrue(foundPipeline);
-            }
-            finally
-            {
-                if (!string.IsNullOrEmpty(createdPipelineId))
-                {
-                    Client.DeletePipeline(new DeletePipelineRequest { PipelineId = createdPipelineId });
-                }
-            }    
-        }
-    }
-}
diff --git a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/AWSSDK.IntegrationTests.DatabaseMigrationService.NetFramework.csproj b/sdk/test/Services/DatabaseMigrationService/IntegrationTests/AWSSDK.IntegrationTests.DatabaseMigrationService.NetFramework.csproj
deleted file mode 100644
index 343f8054b28f..000000000000
--- a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/AWSSDK.IntegrationTests.DatabaseMigrationService.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.DatabaseMigrationService.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.DatabaseMigrationService.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/DatabaseMigrationService/AWSSDK.DatabaseMigrationService.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/Config/462/App.config b/sdk/test/Services/DatabaseMigrationService/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/DataMigrationTests.cs b/sdk/test/Services/DatabaseMigrationService/IntegrationTests/DataMigrationTests.cs
deleted file mode 100644
index 5b85e3e410fb..000000000000
--- a/sdk/test/Services/DatabaseMigrationService/IntegrationTests/DataMigrationTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Amazon.DatabaseMigrationService;
-using Amazon.DatabaseMigrationService.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class DataMigrationTests : TestBase<AmazonDatabaseMigrationServiceClient>
-    {
-        [TestMethod]
-        [TestCategory("DatabaseMigrationService")]
-        public void TestDescribeEndpoints()
-        {
-            var response = Client.DescribeEndpoints(new DescribeEndpointsRequest { });
-            Assert.IsNotNull(response);
-        }
-    }
-}
diff --git a/sdk/test/Services/DirectConnect/IntegrationTests/AWSSDK.IntegrationTests.DirectConnect.NetFramework.csproj b/sdk/test/Services/DirectConnect/IntegrationTests/AWSSDK.IntegrationTests.DirectConnect.NetFramework.csproj
deleted file mode 100644
index 1e435eaa39a3..000000000000
--- a/sdk/test/Services/DirectConnect/IntegrationTests/AWSSDK.IntegrationTests.DirectConnect.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.DirectConnect.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.DirectConnect.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/DirectConnect/AWSSDK.DirectConnect.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/DirectConnect/IntegrationTests/Config/462/App.config b/sdk/test/Services/DirectConnect/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/DirectConnect/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs b/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs
deleted file mode 100644
index 8fac598675e9..000000000000
--- a/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using Amazon.DirectConnect;
-using Amazon.DirectConnect.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class DirectConnect : TestBase<AmazonDirectConnectClient>
-    {
-        [TestMethod]
-        [TestCategory("DirectConnect")]
-        public void TestDescribeConnections()
-        {
-            var response = Client.DescribeConnections();
-            Assert.IsNotNull(response);
-
-            if (response.Connections.Count > 0)
-            {
-                // if we got some connections, verify that the data that is
-                // mandatory when creating a connection marshalled correctly
-                foreach (var c in response.Connections)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(c.ConnectionId));
-                    Assert.IsFalse(string.IsNullOrEmpty(c.ConnectionName));
-                    Assert.IsFalse(string.IsNullOrEmpty(c.Location));
-                    Assert.IsFalse(string.IsNullOrEmpty(c.Bandwidth));
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("DirectConnect")]
-        public void TestDescribeLocations()
-        {
-            var response = Client.DescribeLocations();
-            Assert.IsNotNull(response);
-
-            if (response.Locations.Count > 0)
-            {
-                foreach (var l in response.Locations)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(l.LocationCode));
-                    Assert.IsFalse(string.IsNullOrEmpty(l.LocationName));
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("DirectConnect")]
-        public void TestDescribeVirtualGateways()
-        {
-            var response = Client.DescribeVirtualGateways();
-            Assert.IsNotNull(response);
-
-            if (response.VirtualGateways.Count > 0)
-            {
-                foreach (var vg in response.VirtualGateways)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(vg.VirtualGatewayId));
-                    Assert.IsFalse(string.IsNullOrEmpty(vg.VirtualGatewayState));
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("DirectConnect")]
-        public void TestDescribeVirtualInterfaces()
-        {
-            var response = Client.DescribeVirtualInterfaces();
-            Assert.IsNotNull(response);
-
-            if (response.VirtualInterfaces.Count > 0)
-            {
-                foreach (var vi in response.VirtualInterfaces)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(vi.ConnectionId));
-                    Assert.IsFalse(string.IsNullOrEmpty(vi.VirtualInterfaceId));
-                }
-            }
-        }
-
-        // Test constraint: account must have permissions to create connections
-        //[TestMethod]
-        //[TestCategory("DirectConnect")]
-        public void TestCreateDeleteConnection()
-        {
-            const string BANDWIDTH = "1Gbps";
-
-            var locations = Client.DescribeLocations().Locations;
-            var connectionName = "dotnet-test-connection" + DateTime.UtcNow.Ticks;
-            string connectionId = null;
-
-            try
-            {
-                var connection = Client.CreateConnection(new CreateConnectionRequest
-                {
-                    Bandwidth = BANDWIDTH,
-                    ConnectionName = connectionName,
-                    Location = locations[0].LocationCode
-                });
-
-                connectionId = connection.ConnectionId;
-            }
-            finally
-            {
-                if (!string.IsNullOrEmpty(connectionId))
-                    Client.DeleteConnection(new DeleteConnectionRequest { ConnectionId = connectionId });
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/DirectoryService/IntegrationTests/AWSSDK.IntegrationTests.DirectoryService.NetFramework.csproj b/sdk/test/Services/DirectoryService/IntegrationTests/AWSSDK.IntegrationTests.DirectoryService.NetFramework.csproj
deleted file mode 100644
index 285699009ead..000000000000
--- a/sdk/test/Services/DirectoryService/IntegrationTests/AWSSDK.IntegrationTests.DirectoryService.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.DirectoryService.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.DirectoryService.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/DirectoryService/AWSSDK.DirectoryService.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/DirectoryService/IntegrationTests/Config/462/App.config b/sdk/test/Services/DirectoryService/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/DirectoryService/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/DirectoryService/IntegrationTests/DirectoryService.cs b/sdk/test/Services/DirectoryService/IntegrationTests/DirectoryService.cs
deleted file mode 100644
index ddc3de417499..000000000000
--- a/sdk/test/Services/DirectoryService/IntegrationTests/DirectoryService.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Amazon.DirectoryService;
-using Amazon.DirectoryService.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class DirectoryService : TestBase<AmazonDirectoryServiceClient>
-    {
-        [TestMethod]
-        [TestCategory("DirectoryService")]
-        public void TestGetDirectoryLimits()
-        {
-            var response = Client.GetDirectoryLimits();
-            Assert.IsNotNull(response);
-            Assert.IsTrue(response.DirectoryLimits.ConnectedDirectoriesLimit > 0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/Services/ECR/IntegrationTests/AWSSDK.IntegrationTests.ECR.NetFramework.csproj b/sdk/test/Services/ECR/IntegrationTests/AWSSDK.IntegrationTests.ECR.NetFramework.csproj
deleted file mode 100644
index 785c55bb2242..000000000000
--- a/sdk/test/Services/ECR/IntegrationTests/AWSSDK.IntegrationTests.ECR.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ECR.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ECR.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ECR/AWSSDK.ECR.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ECR/IntegrationTests/Config/462/App.config b/sdk/test/Services/ECR/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ECR/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ECR/IntegrationTests/ECR.cs b/sdk/test/Services/ECR/IntegrationTests/ECR.cs
deleted file mode 100644
index 5bec59a13274..000000000000
--- a/sdk/test/Services/ECR/IntegrationTests/ECR.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Amazon;
-using Amazon.ECR;
-using Amazon.ECR.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ECR : TestBase<AmazonECRClient>
-    {
-        [TestMethod]
-        [TestCategory("ECR")]
-        public void TestRepos()
-        {
-            var repoName = Utils.UtilityMethods.GenerateName("ecs-repo-");
-            var repo = Client.CreateRepository(new CreateRepositoryRequest { RepositoryName = repoName }).Repository;
-
-            var repos = Client.DescribeRepositories(new DescribeRepositoriesRequest { });
-
-            Assert.IsTrue(repos.Repositories
-                            .Select(r => r.RepositoryName)
-                            .Contains(repo.RepositoryName));
-
-            var images = Client.ListImages(new ListImagesRequest { RegistryId = repo.RegistryId, RepositoryName = repo.RepositoryName}).ImageIds;
-
-            Assert.IsFalse(images.Any());
-
-            Client.DeleteRepository(new DeleteRepositoryRequest { RegistryId = repo.RegistryId, RepositoryName = repo.RepositoryName });
-        }
-    }
-}
diff --git a/sdk/test/Services/ElastiCache/IntegrationTests/AWSSDK.IntegrationTests.ElastiCache.NetFramework.csproj b/sdk/test/Services/ElastiCache/IntegrationTests/AWSSDK.IntegrationTests.ElastiCache.NetFramework.csproj
deleted file mode 100644
index c250aa1bbc36..000000000000
--- a/sdk/test/Services/ElastiCache/IntegrationTests/AWSSDK.IntegrationTests.ElastiCache.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ElastiCache.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ElastiCache.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ElastiCache/AWSSDK.ElastiCache.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ElastiCache/IntegrationTests/Config/462/App.config b/sdk/test/Services/ElastiCache/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ElastiCache/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ElastiCache/IntegrationTests/ElastiCache.cs b/sdk/test/Services/ElastiCache/IntegrationTests/ElastiCache.cs
deleted file mode 100644
index 12e3b5bbd100..000000000000
--- a/sdk/test/Services/ElastiCache/IntegrationTests/ElastiCache.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon;
-using Amazon.ElastiCache;
-using Amazon.ElastiCache.Model;
-using Amazon.Runtime;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-using System.Collections.Generic;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ElastiCache : TestBase<AmazonElastiCacheClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [Ignore("Excluding tests that need IAM Write/Permissions management.")]
-        [TestMethod]
-        [TestCategory("ElastiCache")]
-        public void TestCacheParameterGroups()
-        {
-            var groupName = "SDKDotNetTestGroup";
-
-            try
-            {
-                var delRequest = new DeleteCacheParameterGroupRequest();
-                delRequest.CacheParameterGroupName = groupName;
-                Client.DeleteCacheParameterGroup(delRequest);
-            }
-            catch (Exception) { }
-
-            var request = new CreateCacheParameterGroupRequest(groupName, "memcached1.4", "testing");
-
-            var res = Client.CreateCacheParameterGroup(request);
-            try
-            {
-                var response = Client.DescribeCacheParameterGroups();
-                var found = false;
-                foreach (var group in response.CacheParameterGroups)
-                {
-                    Assert.IsNotNull(group.CacheParameterGroupFamily);
-                    Assert.IsNotNull(group.CacheParameterGroupName);
-
-                    if (group.CacheParameterGroupName.Equals(groupName, StringComparison.OrdinalIgnoreCase))
-                        found = true;
-                }
-                Assert.IsTrue(found);
-            }
-            finally
-            {
-                var delRequest = new DeleteCacheParameterGroupRequest();
-                delRequest.CacheParameterGroupName = groupName;
-                Client.DeleteCacheParameterGroup(delRequest);
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("ElastiCache")]
-        public void TestDescribeCacheClusters()
-        {
-            var response = Client.DescribeCacheClusters();
-            if (response.CacheClusters != null)
-            {
-                foreach (var cluster in response.CacheClusters)
-                {
-                    Assert.IsNotNull(cluster.CacheClusterId);
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("ElastiCache")]
-        public void TestDescribeEngineVersions()
-        {
-            var response = Client.DescribeCacheEngineVersions();
-            foreach (var version in response.CacheEngineVersions)
-            {
-                Assert.IsNotNull(version.EngineVersion);
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/AWSSDK.IntegrationTests.ElasticBeanstalk.NetFramework.csproj b/sdk/test/Services/ElasticBeanstalk/IntegrationTests/AWSSDK.IntegrationTests.ElasticBeanstalk.NetFramework.csproj
deleted file mode 100644
index 59d2e31a55c0..000000000000
--- a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/AWSSDK.IntegrationTests.ElasticBeanstalk.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ElasticBeanstalk.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ElasticBeanstalk.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ElasticBeanstalk/AWSSDK.ElasticBeanstalk.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs b/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs
deleted file mode 100644
index 8d21d9dd209c..000000000000
--- a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.ElasticBeanstalk;
-using Amazon.ElasticBeanstalk.Model;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Beanstalk : TestBase<AmazonElasticBeanstalkClient>
-    {
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("ElasticBeanstalk")]
-        public void ListAvailableSolutionStacksTest()
-        {
-            ListAvailableSolutionStacksResponse response = Client.ListAvailableSolutionStacks(new ListAvailableSolutionStacksRequest());
-            Assert.IsNotNull(response);
-            Assert.IsTrue(response.SolutionStacks.Count > 0);
-            foreach (string stack in response.SolutionStacks)
-            {
-                Assert.IsNotNull(stack);
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("ElasticBeanstalk")]
-        public void CheckDNSAvailabilityTest()
-        {
-            CheckDNSAvailabilityRequest request = new CheckDNSAvailabilityRequest()
-            {
-                CNAMEPrefix = "mycnamecheck" + DateTime.UtcNow.Ticks
-            };
-
-            CheckDNSAvailabilityResponse response = Client.CheckDNSAvailability(request);
-            Assert.IsTrue(response.Available.Value);
-            Assert.IsNotNull(response.FullyQualifiedCNAME);
-        }
-
-        [TestMethod]
-        [TestCategory("ElasticBeanstalk")]
-        public void CRUDApplication()
-        {
-            string applicationName = "dotnet-integ-app" + DateTime.UtcNow.Ticks;
-            CreateApplicationRequest createRequest = new CreateApplicationRequest()
-            {
-                ApplicationName = applicationName,
-                Description = "Test Application"
-            };
-
-            CreateApplicationResponse createResponse = Client.CreateApplication(createRequest);
-            Assert.IsNotNull(createResponse.ResponseMetadata.RequestId);
-
-            try
-            {
-                DescribeApplicationsResponse describeResponse = Client.DescribeApplications(new DescribeApplicationsRequest() { ApplicationNames = new List<string>() { applicationName } });
-                Assert.AreEqual(1, describeResponse.Applications.Count);
-                ApplicationDescription app = describeResponse.Applications[0];
-                Assert.AreEqual(applicationName, app.ApplicationName);
-                Assert.AreEqual("Test Application", app.Description);
-                Assert.AreNotEqual(DateTime.MinValue, app.DateCreated);
-                Assert.AreNotEqual(DateTime.MinValue, app.DateUpdated);
-
-                UpdateApplicationRequest updateRequest = new UpdateApplicationRequest()
-                {
-                    ApplicationName = applicationName,
-                    Description = "updated description"
-                };
-                UpdateApplicationResponse updateResponse = Client.UpdateApplication(updateRequest);
-                Assert.AreEqual(applicationName, updateResponse.Application.ApplicationName);
-                Assert.AreEqual("updated description", updateResponse.Application.Description);
-            }
-            finally
-            {
-                Client.DeleteApplication(new DeleteApplicationRequest() { ApplicationName = applicationName });
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Config/462/App.config b/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/AWSSDK.IntegrationTests.ElasticLoadBalancingV2.NetFramework.csproj b/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/AWSSDK.IntegrationTests.ElasticLoadBalancingV2.NetFramework.csproj
deleted file mode 100644
index 44ee562c1d82..000000000000
--- a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/AWSSDK.IntegrationTests.ElasticLoadBalancingV2.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ElasticLoadBalancingV2.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ElasticLoadBalancingV2.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ElasticLoadBalancingV2/AWSSDK.ElasticLoadBalancingV2.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/Config/462/App.config b/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs b/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs
deleted file mode 100644
index c8dfefd13210..000000000000
--- a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using System.Linq;
-
-using Amazon.ElasticLoadBalancingV2;
-using Amazon.ElasticLoadBalancingV2.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ElasticLoadBalancingV2 : TestBase<AmazonElasticLoadBalancingV2Client>
-    {
-        private static string loadBalancerName = "dotnet-test-" + DateTime.UtcNow.ToFileTime();
-        private static string loadBalancerArn = null;
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            if (!string.IsNullOrEmpty(loadBalancerArn))
-            {
-                Client.DeleteLoadBalancer(new DeleteLoadBalancerRequest
-                {
-                    LoadBalancerArn = loadBalancerArn
-                });
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("ElasticLoadBalancingV2")]
-        public void BasicTest()
-        {
-            Client.DescribeLoadBalancers(new DescribeLoadBalancersRequest
-            {
-            });
-        }
-    }
-}
diff --git a/sdk/test/Services/Elasticsearch/IntegrationTests/AWSSDK.IntegrationTests.Elasticsearch.NetFramework.csproj b/sdk/test/Services/Elasticsearch/IntegrationTests/AWSSDK.IntegrationTests.Elasticsearch.NetFramework.csproj
deleted file mode 100644
index 81189551bcfe..000000000000
--- a/sdk/test/Services/Elasticsearch/IntegrationTests/AWSSDK.IntegrationTests.Elasticsearch.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Elasticsearch.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Elasticsearch.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Elasticsearch/AWSSDK.Elasticsearch.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Elasticsearch/IntegrationTests/Config/462/App.config b/sdk/test/Services/Elasticsearch/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Elasticsearch/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Elasticsearch/IntegrationTests/Elasticsearch.cs b/sdk/test/Services/Elasticsearch/IntegrationTests/Elasticsearch.cs
deleted file mode 100644
index dec1e58ddace..000000000000
--- a/sdk/test/Services/Elasticsearch/IntegrationTests/Elasticsearch.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.Elasticsearch;
-using Amazon.Elasticsearch.Model;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-
-
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Elasticsearch : TestBase<AmazonElasticsearchClient>
-    {
-        // Test temporarily disabled.
-        //[TestMethod]
-        //[TestCategory("Elasticsearch")]
-        public void TestElasticsearchOperations()
-        {
-            var domainName = UtilityMethods.GenerateName("domain");
-
-            Client.CreateElasticsearchDomain(new CreateElasticsearchDomainRequest
-            {
-                DomainName = domainName
-            });
-            Thread.Sleep(2000);
-
-            try
-            {
-                var domainNames = Client.ListDomainNames(new ListDomainNamesRequest()).DomainNames;
-                Assert.IsTrue(domainNames.Exists(d => d.DomainName.Equals(domainName)));
-
-                var domains = Client.DescribeElasticsearchDomains(new DescribeElasticsearchDomainsRequest
-                {
-                    DomainNames = new List<string> { domainName }
-                }).DomainStatusList;
-                Assert.IsTrue(domains.Exists(d => d.DomainName.Equals(domainName)));
-            }
-            finally
-            {
-                Client.DeleteElasticsearchDomain(new DeleteElasticsearchDomainRequest
-                {
-                    DomainName = domainName
-                });
-            }
-        }
-
-    }
-}
diff --git a/sdk/test/Services/Glacier/IntegrationTests/AWSSDK.IntegrationTests.Glacier.NetFramework.csproj b/sdk/test/Services/Glacier/IntegrationTests/AWSSDK.IntegrationTests.Glacier.NetFramework.csproj
deleted file mode 100644
index ae49000678e9..000000000000
--- a/sdk/test/Services/Glacier/IntegrationTests/AWSSDK.IntegrationTests.Glacier.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Glacier.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Glacier.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Glacier/AWSSDK.Glacier.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Glacier/IntegrationTests/Config/462/App.config b/sdk/test/Services/Glacier/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Glacier/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs b/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs
deleted file mode 100644
index 407ca9e436fb..000000000000
--- a/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Amazon.Glacier;
-using Amazon.Glacier.Model;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.IO;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Glacier : TestBase<AmazonGlacierClient>
-    {
-        private const long CONTENT_LENGTH = 1024 * 1024 * 5;
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("Glacier")]
-        public void ListCalls()
-        {
-            var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString();
-            Client.CreateVault(new CreateVaultRequest()
-            {
-                VaultName = testingVaultName
-            });
-            Assert.IsNotNull(Client.ListJobs(new ListJobsRequest { VaultName = testingVaultName }));
-            Assert.IsNotNull(Client.ListMultipartUploads(new ListMultipartUploadsRequest { VaultName = testingVaultName }));
-            Assert.IsNotNull(Client.ListVaults(new ListVaultsRequest()));
-
-            Client.DeleteVault(new DeleteVaultRequest { VaultName = testingVaultName });
-        }
-
-        // Commented out because the would leave data in glacier that would cost money
-        //[TestMethod]
-        //[TestCategory("Glacier")]
-        public void TestSimpleUpload()
-        {
-            var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString();
-            Client.CreateVault(new CreateVaultRequest()
-            {
-                VaultName = testingVaultName
-            });
-            const string accountID = "-";
-            string archiveID = null;
-
-            try
-            {
-                var memoryStream = new MemoryStream(Encoding.ASCII.GetBytes("data to archive"));
-                var uploadArchiveRequest = new UploadArchiveRequest
-                {
-                    VaultName = testingVaultName,
-                    Body = memoryStream,
-                    Checksum = TreeHashGenerator.CalculateTreeHash(memoryStream),
-                    AccountId = accountID,
-                    ArchiveDescription = "my first archive"
-                };
-
-                var response = Client.UploadArchive(uploadArchiveRequest);
-                archiveID = response.ArchiveId;
-            }
-            finally
-            {
-                Client.DeleteArchive(new DeleteArchiveRequest { AccountId = accountID, VaultName = testingVaultName, ArchiveId = archiveID });
-            }
-        }
-
-        // Commented out because the would leave data in glacier that would cost money
-        //[TestMethod]
-        //[TestCategory("Glacier")]
-        public void TestMultiPartUpload()
-        {
-            var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString();
-            Client.CreateVault(new CreateVaultRequest()
-            {
-                VaultName = testingVaultName
-            });
-
-            InitiateMultipartUploadRequest initRequest = new InitiateMultipartUploadRequest()
-            {
-                VaultName = testingVaultName,
-                ArchiveDescription = "dotnet mp upload",
-                PartSize = 1048576
-            };
-            InitiateMultipartUploadResponse initResponse = Client.InitiateMultipartUpload(initRequest);
-            string uploadId = initResponse.UploadId;
-
-
-            MemoryStream totalStream = new MemoryStream();
-            for (int i = 0; i < 1048576 + 1048576 / 2; i++)
-            {
-                totalStream.WriteByte((byte)(i % byte.MaxValue));
-            }
-            totalStream.Position = 0;
-
-            List<string> md5s = new List<string>();
-            long currentPosition = 0;
-            long partSize = 1048576;
-            while (totalStream.Position < totalStream.Length)
-            {
-                Stream partStream = GlacierUtils.CreatePartStream(totalStream, partSize);
-                string checkSum = TreeHashGenerator.CalculateTreeHash(partStream);
-                md5s.Add(checkSum);
-
-                UploadMultipartPartRequest partRequest = new UploadMultipartPartRequest()
-                {
-                    VaultName = testingVaultName,
-                    UploadId = uploadId,
-                    Body = partStream,
-                    Checksum = checkSum
-                };
-                partRequest.SetRange(currentPosition, currentPosition + partStream.Length - 1);
-                Client.UploadMultipartPart(partRequest);
-                currentPosition += partStream.Length;
-            }
-
-            CompleteMultipartUploadRequest compRequest = new CompleteMultipartUploadRequest()
-            {
-                VaultName = testingVaultName,
-                UploadId = uploadId,
-                ArchiveSize = totalStream.Length.ToString(),
-                Checksum = TreeHashGenerator.CalculateTreeHash(md5s)
-            };
-            CompleteMultipartUploadResponse compResponse = Client.CompleteMultipartUpload(compRequest);
-            Assert.IsNotNull(compResponse.Location);
-            Assert.IsNotNull(compResponse.Checksum);
-            string archiveId = compResponse.ArchiveId;
-
-            DeleteArchiveRequest delArchiveRequest = new DeleteArchiveRequest()
-            {
-                VaultName = testingVaultName,
-                ArchiveId = archiveId
-            };
-            DeleteArchiveResponse delArchiveResponse = Client.DeleteArchive(delArchiveRequest);
-        }
-    }
-}
diff --git a/sdk/test/Services/ImportExport/IntegrationTests/AWSSDK.IntegrationTests.ImportExport.NetFramework.csproj b/sdk/test/Services/ImportExport/IntegrationTests/AWSSDK.IntegrationTests.ImportExport.NetFramework.csproj
deleted file mode 100644
index 33c92729d8e5..000000000000
--- a/sdk/test/Services/ImportExport/IntegrationTests/AWSSDK.IntegrationTests.ImportExport.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.ImportExport.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.ImportExport.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/ImportExport/AWSSDK.ImportExport.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/ImportExport/IntegrationTests/Config/462/App.config b/sdk/test/Services/ImportExport/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/ImportExport/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs b/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs
deleted file mode 100644
index 1d1a1e2c0409..000000000000
--- a/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.ImportExport;
-using Amazon.ImportExport.Model;
-using Amazon.Runtime;
-
-using Amazon.S3;
-using Amazon.S3.Model;
-using Amazon.S3.Util;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class ImportExport : TestBase<AmazonImportExportClient>
-    {
-        const string IMPORT_MANIFEST =
-@"bucket: @BUCKET@
-accessKeyId: @ACCESS_KEY_ID@
-manifestVersion: 1.3
-eraseDevice: true
-deviceId: 123
-notificationEmail: john.doe@example.com
-returnAddress:
-   name: Amazon.com ATTN:Joe Random
-   street1: 5555555 5th Ave
-   city: Seattle
-   stateOrProvince: WA
-   postalCode: 98104
-   phoneNumber: 206-555-1000
-   country: USA
-";
-
-        const string EXPORT_MANIFEST =
-@"manifestVersion: 1.2
-accessKeyId: @ACCESS_KEY_ID@
-deviceId: 532404500021
-logBucket: @BUCKET@
-trueCryptPassword: apassword
-logPrefix: logs/
-fileSystem: NTFS
-notificationEmail: john.doe@example.com
-operations:
-    - exportBucket: @BUCKET@
-returnAddress:
-    name: Amazon.com ATTN Joe Random
-    street1: 1200 12th Ave S.
-    city: Seattle
-    stateOrProvince: WA
-    postalCode: 98114
-    phoneNumber: 206-266-0000
-    country: USA
-";
-
-        static AmazonS3Client s3Client;
-
-        static string bucketName;
-
-        [ClassInitialize]
-        public static void ClassInitialize(TestContext testContext)
-        {
-            s3Client = new AmazonS3Client();
-
-            // Add test data to export
-            bucketName = "sdk-import-test" + DateTime.UtcNow.Ticks;
-            s3Client.PutBucket(new PutBucketRequest { BucketName = bucketName });
-            s3Client.PutObject(new PutObjectRequest
-            {
-                BucketName = bucketName,
-                Key = "data.txt",
-                ContentBody = "import-export-data"
-            });
-        }
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-
-            if(s3Client != null)
-            {
-                AmazonS3Util.DeleteS3BucketWithObjects(s3Client, bucketName);
-                s3Client.Dispose();
-                s3Client = null;
-            }
-        }
-
-        [Ignore]
-        [TestMethod]
-        [TestCategory("ImportExport")]
-        public void TestImportExport()
-        {
-            // CreateJob
-            CreateJobRequest createJobRequest = new CreateJobRequest
-            {
-                JobType = JobType.Import,
-                Manifest = GetSampleManifestText(IMPORT_MANIFEST)
-            };
-            var createJobResponse = Client.CreateJob(createJobRequest);
-            string createdJobId = createJobResponse.JobId;
-            Assert.IsNotNull(createdJobId);
-            Assert.AreEqual(JobType.Import, createJobResponse.JobType);
-            Assert.IsNotNull(createJobResponse.Signature);
-            Assert.IsNotNull(createJobResponse.SignatureFileContents);
-
-
-            // UpdateJob
-            UpdateJobRequest updateJobRequest = new UpdateJobRequest
-            {
-                JobId = createdJobId,
-                JobType = JobType.Export,
-                Manifest = GetSampleManifestText(EXPORT_MANIFEST)
-            };
-            Client.UpdateJob(updateJobRequest);
-
-
-            // ListJobs
-            var listJobsResponse = Client.ListJobs(new ListJobsRequest { MaxJobs = 100 });
-            Assert.IsNotNull(listJobsResponse.IsTruncated);
-            Job job = FindJob(createdJobId, listJobsResponse.Jobs);
-            Assert.IsNotNull(job);
-            Assert.IsTrue(job.CreationDate > DateTime.MinValue);
-            Assert.IsFalse(job.IsCanceled.Value);
-            Assert.AreEqual(createdJobId, job.JobId);
-            Assert.AreEqual(JobType.Export, job.JobType);
-            Assert.IsFalse(job.IsCanceled.Value);
-
-
-            // GetStatus
-            var getStatusResponse = Client.GetStatus(new GetStatusRequest { JobId = createdJobId });
-            Assert.IsNotNull(getStatusResponse.CreationDate);
-            Assert.IsNotNull(getStatusResponse.CurrentManifest);
-            Assert.AreEqual(createdJobId, getStatusResponse.JobId);
-            Assert.AreEqual(JobType.Export, getStatusResponse.JobType);
-            Assert.IsNotNull(getStatusResponse.ProgressMessage);
-            Assert.IsNotNull(getStatusResponse.LocationMessage);
-            Assert.IsNotNull(getStatusResponse.LocationCode);
-            Assert.IsNotNull(getStatusResponse.Signature);
-            Assert.AreEqual(0, getStatusResponse.ErrorCount);
-            Assert.IsNotNull(getStatusResponse.ProgressMessage);
-            Assert.IsNotNull(getStatusResponse.SignatureFileContents);
-            Assert.IsNull(getStatusResponse.Carrier);
-            Assert.IsNull(getStatusResponse.TrackingNumber);
-            Assert.IsNull(getStatusResponse.LogBucket);
-            Assert.IsNull(getStatusResponse.LogKey);
-
-
-            // Cancel our test job
-            Client.CancelJob(new CancelJobRequest { JobId = createdJobId });
-            AssertJobIsCancelled(createdJobId);
-            createdJobId = null;
-        }
-
-        private Job FindJob(String jobId, List<Job> jobs)
-        {
-            var job = jobs.Find(item => item.JobId == jobId);
-
-            if (job == null)
-                Assert.Fail("Expected to find a job with ID '" + jobId + "', but didn't");
-            return job;
-        }
-
-        private void AssertJobIsCancelled(string jobId)
-        {
-            Job job = FindJob(jobId, Client.ListJobs(new ListJobsRequest()).Jobs);
-            Assert.IsTrue(job.IsCanceled.Value);
-        }
-
-
-
-        private string GetSampleManifestText(string manifest)
-        {
-            manifest = manifest.Replace("@BUCKET@", bucketName);
-            manifest = manifest.Replace("@ACCESS_KEY_ID@", "AAAEXAMPLE");
-
-            return manifest;
-        }
-
-    }
-}
diff --git a/sdk/test/Services/Inspector/IntegrationTests/AWSSDK.IntegrationTests.Inspector.NetFramework.csproj b/sdk/test/Services/Inspector/IntegrationTests/AWSSDK.IntegrationTests.Inspector.NetFramework.csproj
deleted file mode 100644
index 0d5aa79d1bc0..000000000000
--- a/sdk/test/Services/Inspector/IntegrationTests/AWSSDK.IntegrationTests.Inspector.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Inspector.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Inspector.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Inspector/AWSSDK.Inspector.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Inspector/IntegrationTests/Config/462/App.config b/sdk/test/Services/Inspector/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Inspector/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Inspector/IntegrationTests/Inspector.cs b/sdk/test/Services/Inspector/IntegrationTests/Inspector.cs
deleted file mode 100644
index 4ef6ad3d1d80..000000000000
--- a/sdk/test/Services/Inspector/IntegrationTests/Inspector.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.Inspector;
-using Amazon.Inspector.Model;
-using Amazon.Runtime;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    /* Tests disabled pending update to new 2016-02-16 API version
-    [TestClass]
-    public class Inspector : TestBase<AmazonInspectorClient>
-    {
-        [TestInitialize]
-        public void Init()
-        {
-            SetEndpoint(Client, "https://inspector.us-west-2.amazonaws.com", "us-west-2");
-        }
-
-        [TestMethod]
-        public void TestListOperation()
-        {
-            Client.ListApplications(new ListApplicationsRequest { });
-        }
-
-        [TestMethod]
-        public void TestErrorMessageUnmarshalling()
-        {
-            try
-            {
-                Client.CreateResourceGroup(@"{""foo"":""bar""}");
-            }
-            catch (AmazonInspectorException e)
-            {
-                Assert.IsNotNull(e.Message);
-            }
-        }
-
-        [TestMethod]
-        public void TestCrudOperations()
-        {
-            var groupTags = @"[{""key"": ""foo"", ""values"" :[""bar"",""baz""]}]";
-            var groupArn = Client.CreateResourceGroup(new CreateResourceGroupRequest 
-            { 
-                ResourceGroupTags = groupTags,
-            }).ResourceGroupArn;
-
-            Assert.IsNotNull(groupArn);
-
-            var appName = Utils.UtilityMethods.GenerateName();
-            var appArn = Client.CreateApplication(new CreateApplicationRequest { ApplicationName = appName, ResourceGroupArn = groupArn }).ApplicationArn;
-
-            Assert.IsNotNull(appArn);
-
-            var app = Utils.UtilityMethods.WaitUntilSuccess(() => 
-                Client.DescribeApplication(new DescribeApplicationRequest { ApplicationArn = appArn}).Application);
-
-            Assert.AreEqual(appName, app.ApplicationName);
-            Assert.AreEqual(appArn, app.ApplicationArn); 
-            Assert.AreEqual(groupArn, app.ResourceGroupArn);
-
-            Client.UpdateApplication(new UpdateApplicationRequest {  ApplicationArn = appArn, ApplicationName = appName + "X", ResourceGroupArn = groupArn });
-
-            app = Utils.UtilityMethods.WaitUntilSuccess(() =>
-                Client.DescribeApplication(new DescribeApplicationRequest { ApplicationArn = appArn }).Application);
-
-            Assert.AreEqual(appName + "X", app.ApplicationName);
-
-            Client.DeleteApplication(new DeleteApplicationRequest { ApplicationArn = appArn });
-        }
-
-    }*/
-}
diff --git a/sdk/test/Services/IoT/IntegrationTests/AWSSDK.IntegrationTests.IoT.NetFramework.csproj b/sdk/test/Services/IoT/IntegrationTests/AWSSDK.IntegrationTests.IoT.NetFramework.csproj
deleted file mode 100644
index b48c38452ee9..000000000000
--- a/sdk/test/Services/IoT/IntegrationTests/AWSSDK.IntegrationTests.IoT.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.IoT.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.IoT.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/IoT/AWSSDK.IoT.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/IoT/IntegrationTests/Config/462/App.config b/sdk/test/Services/IoT/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/IoT/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/IoT/IntegrationTests/IoT.cs b/sdk/test/Services/IoT/IntegrationTests/IoT.cs
deleted file mode 100644
index ba89ce10ef5c..000000000000
--- a/sdk/test/Services/IoT/IntegrationTests/IoT.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.IoT;
-using Amazon.IoT.Model;
-using Amazon.Runtime;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class IoT : TestBase<AmazonIoTClient>
-    {
-        [TestMethod]
-        [TestCategory("IoT")]
-        public void TestListCall()
-        {
-            Client.ListPolicies(new ListPoliciesRequest { AscendingOrder = true });
-        }
-
-        [TestMethod]
-        [TestCategory("IoT")]
-        public void TestThingOperations()
-        {
-            var thingName = Utils.UtilityMethods.GenerateName();
-            var thingArn = Client.CreateThing(new CreateThingRequest
-            {
-                ThingName = thingName,
-                AttributePayload = new AttributePayload { Attributes = new Dictionary<string, string> { { "foo", "bar" } } }
-            }).ThingArn;
-
-            Assert.IsNotNull(thingArn);
-
-            var attr = Client.DescribeThing(new DescribeThingRequest { ThingName = thingName }).Attributes;
-
-            Assert.IsTrue(attr.ContainsKey("foo"));
-            Assert.AreEqual("bar", attr["foo"]);
-
-            Utils.UtilityMethods.WaitUntilSuccess(() =>
-                Client.DeleteThing(new DeleteThingRequest { ThingName = thingName })
-            );
-        }
-
-        [TestMethod]
-        [TestCategory("IoT")]
-        public void TestErrorMessage()
-        {
-            try
-            {
-                Client.CreatePolicy("Foobar", "{}");
-            }
-            catch (AmazonIoTException e)
-            {
-                Assert.IsNotNull(e.Message);
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("IoT")]
-        public void TestCertificateOperations()
-        {
-            var response = Client.CreateKeysAndCertificate(new CreateKeysAndCertificateRequest { });
-            Assert.IsNotNull(response.CertificateArn);
-            Assert.IsNotNull(response.CertificateId);
-            Assert.IsNotNull(response.CertificatePem);
-            Assert.IsNotNull(response.KeyPair.PublicKey);
-            Assert.IsNotNull(response.KeyPair.PrivateKey);
-
-            
-            Client.CreateKeysAndCertificate(false);
-
-            Utils.UtilityMethods.WaitUntilSuccess(() =>
-                Client.DeleteCertificate(new DeleteCertificateRequest { CertificateId = response.CertificateId })
-            );
-        }
-    }
-}
diff --git a/sdk/test/Services/Kinesis/IntegrationTests/AWSSDK.IntegrationTests.Kinesis.NetFramework.csproj b/sdk/test/Services/Kinesis/IntegrationTests/AWSSDK.IntegrationTests.Kinesis.NetFramework.csproj
deleted file mode 100644
index 90515aef53ef..000000000000
--- a/sdk/test/Services/Kinesis/IntegrationTests/AWSSDK.IntegrationTests.Kinesis.NetFramework.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Kinesis.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Kinesis.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Kinesis/AWSSDK.Kinesis.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/KinesisFirehose/AWSSDK.KinesisFirehose.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Kinesis/IntegrationTests/Config/462/App.config b/sdk/test/Services/Kinesis/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Kinesis/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs b/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs
deleted file mode 100644
index 92e35a13f52f..000000000000
--- a/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.Kinesis;
-using Amazon.Kinesis.Model;
-using Amazon.Runtime;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Kinesis : TestBase<AmazonKinesisClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            // Delete all dotnet integ test streams.
-            var streamNames = Client.ListStreams().StreamNames;
-            foreach (var streamName in streamNames)
-            {
-                if (streamName.Contains("dotnet-integ-test-stream"))
-                {
-                    try
-                    {
-                        Client.DeleteStream(new DeleteStreamRequest
-                        {
-                            StreamName = streamName
-                        });
-                    }
-                    catch(Exception e)
-                    {
-                        Console.WriteLine("Failed to delete stream {0}: {1}", streamName, e.Message);
-                    }
-                }
-            }
-
-            // BaseClean();
-        }
-        
-
-        [TestMethod]
-        [TestCategory("Kinesis")]
-        public void KinesisCRUD()
-        {
-            var streamName = "dotnet-integ-test-stream-" + DateTime.UtcNow.Ticks;
-            Action waitUntilStreamActive = () => UtilityMethods.WaitUntil(() =>
-                Client.DescribeStream(new DescribeStreamRequest { StreamName = streamName }).StreamDescription.StreamStatus == StreamStatus.ACTIVE);
-
-            // Create a stream.
-            Client.CreateStream(new CreateStreamRequest
-            {
-                ShardCount = 1,
-                StreamName = streamName
-            });
-
-            // Describe the stream.
-            var stream = Client.DescribeStream(new DescribeStreamRequest
-            {
-                StreamName = streamName
-            }).StreamDescription;
-            Assert.AreEqual(stream.HasMoreShards, false);
-            Assert.IsFalse(string.IsNullOrEmpty(stream.StreamARN));
-            Assert.AreEqual(stream.StreamName, streamName);
-            Assert.IsTrue(stream.StreamStatus == StreamStatus.CREATING);
-
-            waitUntilStreamActive();
-
-            var retentionHours = stream.RetentionPeriodHours;
-            var newRetentionHours = retentionHours * 2;
-
-            Client.IncreaseStreamRetentionPeriod(streamName, newRetentionHours);
-            waitUntilStreamActive();
-            stream = Client.DescribeStream(new DescribeStreamRequest
-            {
-                StreamName = streamName
-            }).StreamDescription;
-            Assert.AreEqual(newRetentionHours, stream.RetentionPeriodHours);
-
-            Client.DecreaseStreamRetentionPeriod(streamName, retentionHours);
-            waitUntilStreamActive();
-            stream = Client.DescribeStream(new DescribeStreamRequest
-            {
-                StreamName = streamName
-            }).StreamDescription;
-            Assert.AreEqual(retentionHours, stream.RetentionPeriodHours);
-
-            // List streams.
-            var streamNames = Client.ListStreams().StreamNames;
-            Assert.IsTrue(streamNames.Count > 0);
-            Assert.IsTrue(streamNames.Contains(streamName));
-
-            // Delete the stream.
-            Client.DeleteStream(new DeleteStreamRequest
-            {
-                StreamName = streamName
-            });
-            stream = Client.DescribeStream(new DescribeStreamRequest
-            {
-                StreamName = streamName
-            }).StreamDescription;
-            Assert.IsTrue(stream.StreamStatus == StreamStatus.DELETING);
-        }
-
-        private StreamDescription WaitForStreamToBeActive(string streamName)
-        {
-            while (true)
-            {
-                var stream = Client.DescribeStream(new DescribeStreamRequest
-                {
-                    StreamName = streamName
-                }).StreamDescription;
-
-                if (stream.StreamStatus != StreamStatus.ACTIVE)
-                {
-                    Thread.Sleep(5 * 1000);
-                    continue;
-                }
-                else
-                {
-                    return stream;
-                }
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs b/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs
deleted file mode 100644
index 899692f724e6..000000000000
--- a/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.KinesisFirehose;
-using Amazon.KinesisFirehose.Model;
-using Amazon.IdentityManagement;
-using Amazon.S3;
-using Amazon.IdentityManagement.Model;
-using Amazon.S3.Util;
-using System.IO;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class KinesisFirehose : TestBase<AmazonKinesisFirehoseClient>
-    {
-        private static string TestAccountId = UtilityMethods.AccountId;
-        static IAmazonIdentityManagementService iamClient = new AmazonIdentityManagementServiceClient();
-        static AmazonS3Client s3Client = new AmazonS3Client();
-
-        private string BucketName = null;
-        private string RoleName = null;
-        private string PolicyName = null;
-        private string DeliveryStreamName = null;
-
-        public static readonly string FirehoseAssumeRolePolicyDocumentFormat =
-@"{{
-  ""Version"": ""2012-10-17"",
-  ""Statement"": [
-    {{
-      ""Sid"": """",
-      ""Effect"": ""Allow"",
-      ""Principal"": {{
-        ""Service"": ""firehose.amazonaws.com""
-      }},
-      ""Action"": ""sts:AssumeRole"",
-      ""Condition"": {{
-        ""StringEquals"": {{
-          ""sts:ExternalId"": ""{0}""
-        }}
-      }}
-    }}
-  ]
-}}
-".Trim();
-
-        private static string RolePolicyDocumentFormat =
-@"{{
-  ""Version"": ""2012-10-17"",
-  ""Statement"": [
-    {{
-      ""Sid"": """",
-      ""Effect"": ""Allow"",
-      ""Action"": [
-        ""s3:AbortMultipartUpload"",
-        ""s3:GetBucketLocation"",
-        ""s3:GetObject"",
-        ""s3:ListBucket"",
-        ""s3:ListBucketMultipartUploads"",
-        ""s3:PutObject""
-      ],
-      ""Resource"": [
-        ""arn:aws:s3:::{0}"",
-        ""arn:aws:s3:::{0}/*""
-      ]
-    }}
-  ]
-}}";
-
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            // Create S3 Bucket
-            BucketName = "sdk-dotnet-integ-test-bucket-firehose" + DateTime.UtcNow.Ticks;
-            s3Client.PutBucket(BucketName);
-
-            // Create IAM Role
-            RoleName = "NetFirehoseTestRole" + DateTime.UtcNow.Ticks;
-            if (string.IsNullOrEmpty(TestAccountId))
-                Assert.Fail("TestAccountId must be specified to run these tests");
-
-            var iamCreateResponse = iamClient.CreateRole(new CreateRoleRequest
-            {
-                RoleName = RoleName,
-                AssumeRolePolicyDocument = string.Format(FirehoseAssumeRolePolicyDocumentFormat, TestAccountId)
-            });
-            string roleArn = iamCreateResponse.Role.Arn;
-            Assert.IsNotNull(roleArn);
-
-            // Attach Policy to Role
-            PolicyName = "NetFirehoseTestRolePolicy" + DateTime.UtcNow.Ticks;
-            iamClient.PutRolePolicy(new PutRolePolicyRequest()
-            {
-                PolicyDocument = string.Format(RolePolicyDocumentFormat, BucketName),
-                PolicyName = PolicyName,
-                RoleName = RoleName
-            });
-
-            // Wait for eventual consistency of role.
-            Thread.Sleep(TimeSpan.FromSeconds(10)); 
-
-            // Create Firehose Delivery Stream
-            string bucketArn = "arn:aws:s3:::" + BucketName;
-            DeliveryStreamName = "dotnet-test-delivery-stream" + DateTime.UtcNow.Ticks;
-            string deliveryStreamArn = Client.CreateDeliveryStream(new CreateDeliveryStreamRequest()
-            {
-                DeliveryStreamName = DeliveryStreamName,
-                S3DestinationConfiguration = new S3DestinationConfiguration()
-                {
-                    BucketARN = bucketArn,
-                    RoleARN = roleArn
-                }
-            }).DeliveryStreamARN;
-            if (string.IsNullOrEmpty(deliveryStreamArn))
-            {
-                Assert.Fail("Expected a deliveryStreamArn value");
-            }
-
-            // Wait for Delivery Stream to be active
-            DeliveryStreamStatus streamStatus = DeliveryStreamStatus.CREATING;
-            var timeout = DateTime.UtcNow.AddSeconds(120);
-            while (streamStatus != DeliveryStreamStatus.ACTIVE && DateTime.UtcNow.Ticks < timeout.Ticks)
-            {
-                streamStatus = Client.DescribeDeliveryStream(new DescribeDeliveryStreamRequest()
-                {
-                    DeliveryStreamName = DeliveryStreamName
-                }).DeliveryStreamDescription.DeliveryStreamStatus;
-                Assert.AreNotEqual(streamStatus, DeliveryStreamStatus.DELETING);
-                Thread.Sleep(TimeSpan.FromSeconds(2));
-            }
-            Assert.AreNotEqual(streamStatus, DeliveryStreamStatus.CREATING, "Did not exit CREATING state within time limit.");
-        }
-
-        [TestCleanup]
-        public void TestCleanup()
-        {
-            try
-            {
-                // Check if stream status qualifies it to be deleted.
-                var streamStatus = Client.DescribeDeliveryStream(new DescribeDeliveryStreamRequest()
-                {
-                    DeliveryStreamName = DeliveryStreamName
-                }).DeliveryStreamDescription.DeliveryStreamStatus;
-
-                if (streamStatus == DeliveryStreamStatus.ACTIVE || streamStatus == DeliveryStreamStatus.DELETING)
-                    Client.DeleteDeliveryStream(DeliveryStreamName);
-            }
-
-            catch (Exception)
-            {}
-
-            try
-            {
-                // Delete Role Policy
-                iamClient.DeleteRolePolicy(new DeleteRolePolicyRequest()
-                {
-                    RoleName = RoleName,
-                    PolicyName = PolicyName
-                });
-
-                // Delete Role
-                iamClient.DeleteRole(new DeleteRoleRequest()
-                {
-                    RoleName = RoleName
-                });
-            }
-
-            catch (Exception)
-            {}
-
-            try
-            {
-                // Delete Bucket
-                AmazonS3Util.DeleteS3BucketWithObjects(s3Client, BucketName);
-            }
-
-            catch(Exception)
-            {}
-        }
-
-        [Ignore("Excluding tests that need IAM Write/Permissions management.")]
-        [TestMethod]
-        [TestCategory("Kinesis")]
-        public void TestListDeliveryStreams()
-        {
-            List<string> streamNames = Client.ListDeliveryStreams().DeliveryStreamNames;
-            Assert.IsNotNull(streamNames);
-        }
-
-        [Ignore("Excluding tests that need IAM Write/Permissions management.")]
-        [TestMethod]
-        [TestCategory("Kinesis")]
-        public void TestPutRecord()
-        {
-            using (var data = new MemoryStream())
-            {
-                using (var writer = new StreamWriter(data))
-                {
-                    writer.Write("DATAdataDATAdataDATAdata");
-                    writer.Flush();
-                    data.Position = 0;
-                }
-                string recordId = Client.PutRecord(DeliveryStreamName, new Record() { Data = data }).RecordId;
-                if (string.IsNullOrEmpty(recordId))
-                {
-                    Assert.Fail("Expected recordId to have a value.");
-                }
-            }
-        }
-
-        [Ignore("Excluding tests that need IAM Write/Permissions management.")]
-        [TestMethod]
-        [TestCategory("Kinesis")]
-        [ExpectedException(typeof(ResourceNotFoundException))]
-        public void TestPutRecordNonExistantStream()
-        {
-            using (var data = new MemoryStream())
-            {
-                using (var writer = new StreamWriter(data))
-                {
-                    writer.Write("DATAdataDATAdataDATAdata");
-                    writer.Flush();
-                    data.Position = 0;
-                }
-
-                Client.PutRecord("NonExistantStream", new Record() { Data = data });
-            }
-        }
-
-        [Ignore("Excluding tests that need IAM Write/Permissions management.")]
-        [TestMethod]
-        [TestCategory("Kinesis")]
-        public void TestPutRecordBatch()
-        {
-            int recordCount = 8;
-
-            List<Record> records = new List<Record>();
-            try
-            {
-                for (int i = 0; i < recordCount; i++)
-                {
-                    var data = new MemoryStream();
-                    using (var writer = new StreamWriter(data))
-                    {
-                        writer.Write(string.Format("DATA{0}data{0}DATA{0}data{0}DATA{0}data{0}", i));
-                        writer.Flush();
-                        data.Position = 0;
-                    }
-                    records.Add(new Record { Data = data });
-                }
-                var response = Client.PutRecordBatch(DeliveryStreamName, records);
-
-                HashSet<string> recordIds = new HashSet<string>();
-                foreach (var individualResponse in response.RequestResponses)
-                {
-                    recordIds.Add(individualResponse.RecordId);
-                }
-
-                Assert.AreEqual(recordIds.Count, recordCount);
-                Assert.AreEqual(response.FailedPutCount, 0, "Expected FailedPutCount == 0");
-            }
-            finally
-            {
-                foreach (var record in records)
-                {
-                    record.Data.Dispose();
-                }
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/MachineLearning/IntegrationTests/AWSSDK.IntegrationTests.MachineLearning.NetFramework.csproj b/sdk/test/Services/MachineLearning/IntegrationTests/AWSSDK.IntegrationTests.MachineLearning.NetFramework.csproj
deleted file mode 100644
index 64f4ddef2e11..000000000000
--- a/sdk/test/Services/MachineLearning/IntegrationTests/AWSSDK.IntegrationTests.MachineLearning.NetFramework.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.MachineLearning.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.MachineLearning.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/MachineLearning/AWSSDK.MachineLearning.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/S3/AWSSDK.S3.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/MachineLearning/IntegrationTests/Config/462/App.config b/sdk/test/Services/MachineLearning/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/MachineLearning/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/MachineLearning/IntegrationTests/MachineLearning.cs b/sdk/test/Services/MachineLearning/IntegrationTests/MachineLearning.cs
deleted file mode 100644
index 2ce5ef0a6b7d..000000000000
--- a/sdk/test/Services/MachineLearning/IntegrationTests/MachineLearning.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Amazon.MachineLearning;
-using Amazon.MachineLearning.Model;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-using Amazon.S3;
-using Amazon.S3.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Amazon.S3.Util;
-using System.Threading;
-
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class MachineLearning : TestBase<AmazonMachineLearningClient>
-    {
-        static AmazonS3Client s3Client = new AmazonS3Client();
-        static string DATA_SCHEMA = @"{
-             ""version"": ""1.0"",
-             ""recordAnnotationFieldName"": null,
-             ""recordWeightFieldName"": null,
-             ""targetFieldName"": ""a"",
-             ""dataFormat"": ""CSV"",
-             ""dataFileContainsHeader"": false,
-             ""variables"": [
-               {
-                 ""fieldName"": ""a"",
-                 ""fieldType"": ""BINARY""
-               },
-               {
-                 ""fieldName"": ""b"",
-                 ""fieldType"": ""NUMERIC""
-               },
-               {
-                 ""fieldName"": ""c"",
-                 ""fieldType"": ""CATEGORICAL""
-               },
-               {
-                 ""fieldName"": ""d"",
-                 ""fieldType"": ""TEXT""
-               }
-             ]
-           }";
-
-        static string testRunId = UtilityMethods.GenerateName();
-        static string bucketName = testRunId;
-
-        
-        [ClassInitialize]
-        public static void Setup(TestContext ctx)
-        {
-            s3Client.PutBucket(bucketName);
-        }
-
-        [ClassCleanup]
-        public static void Teardown()
-        {
-            AmazonS3Util.DeleteS3BucketWithObjects(s3Client, bucketName);
-
-            var models = Client.DescribeMLModels(new DescribeMLModelsRequest {
-                FilterVariable = MLModelFilterVariable.Name,
-                Prefix = testRunId
-            }).Results;
-
-            foreach (var model in models)
-            {
-                try
-                {
-                    if (model.EndpointInfo.EndpointStatus != RealtimeEndpointStatus.NONE)
-                        Client.DeleteRealtimeEndpoint(new DeleteRealtimeEndpointRequest { MLModelId = model.MLModelId });
-                    Client.DeleteMLModel(new DeleteMLModelRequest { MLModelId = model.MLModelId });
-                }
-                catch
-                {
-                    Console.WriteLine("Failed to remove Model with id={0}", model.MLModelId);
-                }
-            }
-
-            var dataSources = Client.DescribeDataSources(new DescribeDataSourcesRequest {
-                FilterVariable = DataSourceFilterVariable.DataLocationS3,
-                Prefix = "s3://" + testRunId
-            }).Results;
-
-            foreach (var ds in dataSources) 
-            {             
-                try
-                {
-                    Client.DeleteDataSource(new DeleteDataSourceRequest { DataSourceId = ds.DataSourceId });
-                }
-                catch
-                {
-                    Console.WriteLine("Failed to remove DataSource with id={0}", ds.DataSourceId);
-                }
-            }
-        }
-
-        
-        //[TestMethod]
-        [TestCategory("MachineLearning")]
-        public void TestCreateModel()
-        {
-            s3Client.PutObject(new PutObjectRequest { 
-                BucketName = bucketName, 
-                Key = "data.csv", 
-                ContentBody = "0, 42, foo, bar", 
-                CannedACL = S3CannedACL.PublicRead 
-            });
-
-            var dataLocation = String.Format("s3://{0}/data.csv", bucketName);
-
-            var dataSourceId = Client.CreateDataSourceFromS3(new CreateDataSourceFromS3Request {
-                ComputeStatistics = true,
-                DataSpec = new S3DataSpec 
-                {
-                    DataLocationS3 = dataLocation,
-                    DataSchema = DATA_SCHEMA
-                }
-            }).DataSourceId;
-
-            var source = Client.DescribeDataSources(new DescribeDataSourcesRequest
-            {
-                  FilterVariable = DataSourceFilterVariable.DataLocationS3,
-                  EQ = dataLocation
-            }).Results.FirstOrDefault();
-
-            Assert.IsNotNull(source);
-
-            var modelName = UtilityMethods.GenerateName(testRunId);
-
-            var modelId = Client.CreateMLModel(new CreateMLModelRequest { 
-                MLModelName = modelName,
-                TrainingDataSourceId = dataSourceId,
-                MLModelType = MLModelType.BINARY
-            }).MLModelId;
-
-            UtilityMethods.WaitUntil(() => {
-                var model = Client.DescribeMLModels(new DescribeMLModelsRequest {
-                    FilterVariable = MLModelFilterVariable.Name,
-                    EQ = modelName
-                }).Results.First();
-
-                return model.Status == EntityStatus.COMPLETED;
-                }, 30, 1800);
-
-            var uri = Client.CreateRealtimeEndpoint(new CreateRealtimeEndpointRequest
-            {
-                MLModelId = modelId
-            }).RealtimeEndpointInfo.EndpointUrl;
-
-            UtilityMethods.WaitUntil(() => {
-                var model = Client.DescribeMLModels(new DescribeMLModelsRequest
-                {
-                    FilterVariable = MLModelFilterVariable.Name,
-                    EQ = modelName
-                }).Results.First();
-
-                return model.EndpointInfo.EndpointStatus == RealtimeEndpointStatus.READY;
-            }, 30, 1800);
-
-            Assert.IsNotNull(uri);
-
-            // READY doesn't mean ready...
-
-            Thread.Sleep(TimeSpan.FromSeconds(10));
-
-            var prediction = Client.Predict(new PredictRequest
-            {
-                MLModelId = modelId,
-                PredictEndpoint = uri,
-                Record = new Dictionary<string, string> {
-                     {"b", "123"}, {"c", "oop"}, {"d", "goop"}
-                 }
-            }).Prediction;
-
-            Assert.IsNotNull(prediction);
-        }
-    }
-
-}
diff --git a/sdk/test/Services/Route53Domains/IntegrationTests/AWSSDK.IntegrationTests.Route53Domains.NetFramework.csproj b/sdk/test/Services/Route53Domains/IntegrationTests/AWSSDK.IntegrationTests.Route53Domains.NetFramework.csproj
deleted file mode 100644
index e5eb357829c7..000000000000
--- a/sdk/test/Services/Route53Domains/IntegrationTests/AWSSDK.IntegrationTests.Route53Domains.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Route53Domains.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Route53Domains.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Route53Domains/AWSSDK.Route53Domains.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Route53Domains/IntegrationTests/Config/462/App.config b/sdk/test/Services/Route53Domains/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Route53Domains/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Route53Domains/IntegrationTests/Route53Domains.cs b/sdk/test/Services/Route53Domains/IntegrationTests/Route53Domains.cs
deleted file mode 100644
index 3ab9a09899b5..000000000000
--- a/sdk/test/Services/Route53Domains/IntegrationTests/Route53Domains.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.Route53Domains;
-using Amazon.Route53Domains.Model;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Route53Domains : TestBase<AmazonRoute53DomainsClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("Route53Domains")]
-        public void CheckDomainAvailabilityTest()
-        {
-            var checkRequest = new CheckDomainAvailabilityRequest
-            {
-                DomainName = "mydomain1111111111111.com"
-            };
-            var response = Client.CheckDomainAvailability(checkRequest);
-            Assert.AreEqual(DomainAvailability.AVAILABLE, response.Availability);
-
-            checkRequest = new CheckDomainAvailabilityRequest
-            {
-                DomainName = "mydomain1111111111111.fake"
-            };
-            AssertExtensions.ExpectException<UnsupportedTLDException>(() => Client.CheckDomainAvailability(checkRequest));
-
-            var domains = Client.ListDomains().Domains;
-            if (domains.Count > 0)
-            {
-                checkRequest.DomainName = domains[0].DomainName;
-                response = Client.CheckDomainAvailability(checkRequest);
-                Assert.AreEqual(DomainAvailability.UNAVAILABLE, response.Availability);
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("Route53Domains")]
-        public void TestTagging()
-        {
-            var domains = Client.ListDomains().Domains;
-            if (domains.Count > 0)
-            {
-                TestTagging(Client, domains[0].DomainName);
-            }
-        }
-
-        private void TestTagging(AmazonRoute53DomainsClient client, string domain)
-        {
-            var existingTags = client.ListTagsForDomain(domain).TagList;
-
-            client.UpdateTagsForDomain(domain,
-            new List<Tag>
-            {
-                new Tag { Key = "tag1", Value = "42" },
-                new Tag { Key = "tag2", Value = "ALL" }
-            });
-
-            var tags = client.ListTagsForDomain(domain).TagList;
-            var count = tags.Count;
-            Assert.AreEqual(2, count);
-
-            client.DeleteTagsForDomain(domain, new List<string> { "tag1" });
-
-            tags = client.ListTagsForDomain(domain).TagList;
-            count = tags.Count;
-            Assert.AreEqual(1, count);
-
-            // Restore previous tags
-            if (existingTags.Count > 0)
-                client.UpdateTagsForDomain(domain, existingTags);
-            else
-                client.DeleteTagsForDomain(domain, new List<string> { "tag2" });
-
-            tags = client.ListTagsForDomain(domain).TagList;
-            count = tags.Count;
-            Assert.AreEqual(existingTags.Count, count);
-        }
-    }
-}
diff --git a/sdk/test/Services/SimpleDB/IntegrationTests/AWSSDK.IntegrationTests.SimpleDB.NetFramework.csproj b/sdk/test/Services/SimpleDB/IntegrationTests/AWSSDK.IntegrationTests.SimpleDB.NetFramework.csproj
deleted file mode 100644
index 30d3d0f67b21..000000000000
--- a/sdk/test/Services/SimpleDB/IntegrationTests/AWSSDK.IntegrationTests.SimpleDB.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.SimpleDB.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.SimpleDB.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/SimpleDB/AWSSDK.SimpleDB.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/SimpleDB/IntegrationTests/Config/462/App.config b/sdk/test/Services/SimpleDB/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/SimpleDB/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs b/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs
deleted file mode 100644
index 540d53c254d0..000000000000
--- a/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs
+++ /dev/null
@@ -1,391 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.SimpleDB;
-using Amazon.SimpleDB.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    /// <summary>
-    /// Integration tests for SimpleDB client.
-    /// </summary>
-    [TestClass]
-    public class SimpleDB : TestBase<AmazonSimpleDBClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        // Name of the domain used for all the integration tests.        
-        private static string domainName = "aws-net-sdk-domain-" + DateTime.UtcNow.Ticks;
-
-        // All test data used in these integration tests.        
-        private static List<ReplaceableItem> ALL_TEST_DATA = new List<ReplaceableItem>{
-                new ReplaceableItem{
-                    Name= "foo", 
-                    Attributes= new List<ReplaceableAttribute>
-                    {
-                        new ReplaceableAttribute{Name="1",Value= "2"},                        
-                        new ReplaceableAttribute{Name="3",Value= "4"},
-                        new ReplaceableAttribute{Name="5",Value= "6"}
-                    }
-                },
-                new ReplaceableItem{
-                    Name="boo",
-                    Attributes= new List<ReplaceableAttribute>
-                    {
-                        new ReplaceableAttribute{Name="X",Value= "Y"},
-                        new ReplaceableAttribute{Name="Z",Value= "Q"}
-                    }
-                },
-                new ReplaceableItem{
-                    Name= "baa",
-                    Attributes= new List<ReplaceableAttribute>
-                    {
-                        new ReplaceableAttribute{Name="A'",Value= "B'"},
-                        new ReplaceableAttribute{Name="(C)", Value = "(D)"},
-                        new ReplaceableAttribute{Name="E",Value= "F"}}
-                }};
-
-        private ReplaceableItem FOO_ITEM = ALL_TEST_DATA[0];
-
-        private List<ReplaceableItem> ITEM_LIST =
-            new List<ReplaceableItem> { ALL_TEST_DATA[1], ALL_TEST_DATA[2] };
-
-        [TestCleanup]
-        public void TearDown()
-        {
-            try
-            {
-                DeleteDomain(domainName);
-            }
-            catch (AmazonSimpleDBException) { }
-        }
-
-
-        [TestMethod]
-        [TestCategory("SimpleDB")]
-        public void TestSimpleDBOperations()
-        {
-            TestCreateDomain();
-            try
-            {
-                Thread.Sleep(5 * 1000);
-
-                TestPutAttributes();
-                TestPutAttributesWithCondition();
-                TestBatchPutAttributes();
-
-                TestGetAttributes();
-                TestListDomains();
-                TestDomainMetadata();
-
-                TestSelect();
-                TestDeleteAttributes();
-            }
-            finally
-            {
-                TestDeleteDomain();
-            }
-        }
-
-        private void TestCreateDomain()
-        {
-            Assert.IsFalse(DoesDomainExist(domainName));
-            CreateDomain(domainName);
-
-            bool found = false;
-            for (int retries = 0; retries < 5 && !found; retries++)
-            {
-                Thread.Sleep(1000 * retries);
-                found = DoesDomainExist(domainName);
-            }
-            Assert.IsTrue(found);
-        }
-
-        private void TestDeleteDomain()
-        {
-            DeleteDomain(domainName);
-            Assert.IsFalse(DoesDomainExist(domainName));
-        }
-
-        private void TestListDomains()
-        {
-            var listDomainsResult = Client.ListDomains(new ListDomainsRequest());
-            List<string> domainNames = listDomainsResult.DomainNames;
-            Assert.IsTrue(domainNames.Contains(domainName));
-        }
-
-        private void TestPutAttributes()
-        {
-            PutAttributesRequest request = new PutAttributesRequest()
-            {
-                DomainName = domainName,
-                ItemName = FOO_ITEM.Name,
-                Attributes = FOO_ITEM.Attributes
-            };
-            Client.PutAttributes(request);
-            assertItemsStoredInDomain(Client, new List<ReplaceableItem> { FOO_ITEM }, domainName);
-        }
-
-        private void TestPutAttributesWithCondition()
-        {
-            PutAttributesRequest request = new PutAttributesRequest()
-            {
-                DomainName = domainName,
-                ItemName = FOO_ITEM.Name,
-                Attributes = new List<ReplaceableAttribute>() { FOO_ITEM.Attributes[0] },
-                Expected = new UpdateCondition()
-                {
-                    Name = FOO_ITEM.Attributes[0].Name,
-                    Exists = true,
-                    Value = FOO_ITEM.Attributes[0].Value
-                }
-            };
-
-            request.Attributes[0].Replace = true;
-            request.Attributes[0].Value = "11";
-            FOO_ITEM.Attributes[0].Value = "11";
-
-            Client.PutAttributes(request);
-
-            assertItemsStoredInDomain(Client, new List<ReplaceableItem> { FOO_ITEM }, domainName);
-        }
-
-        private void TestBatchPutAttributes()
-        {
-            BatchPutAttributesRequest request = new BatchPutAttributesRequest()
-            {
-                DomainName = domainName,
-                Items = ITEM_LIST
-            };
-            Client.BatchPutAttributes(request);
-            assertItemsStoredInDomain(Client, ITEM_LIST, domainName);
-        }
-
-        private void TestSelect()
-        {
-            SelectRequest request = new SelectRequest()
-            {
-                SelectExpression = "select * from `" + domainName + "`",
-                ConsistentRead = true
-            };
-            var selectResult = Client.Select(request);
-
-            AssertItemsPresent(ITEM_LIST, selectResult.Items);
-            AssertItemsPresent(new List<ReplaceableItem> { FOO_ITEM }, selectResult.Items);
-        }
-
-        private void TestDomainMetadata()
-        {
-            System.Threading.Thread.Sleep(5 * 1000);
-            DomainMetadataRequest request = new DomainMetadataRequest() { DomainName = domainName };
-            var domainMetadataResult = Client.DomainMetadata(request);
-
-            int expectedItemCount = 0;
-            int expectedAttributeValueCount = 0;
-            int expectedAttributeNameCount = 0;
-
-            foreach (ReplaceableItem item in ALL_TEST_DATA)
-            {
-                expectedItemCount++;
-                expectedAttributeNameCount += item.Attributes.Count;
-                expectedAttributeValueCount += item.Attributes.Count;
-            }
-
-            Assert.AreEqual<int>(expectedItemCount, domainMetadataResult.ItemCount.Value);
-            Assert.AreEqual<int>(expectedAttributeNameCount, domainMetadataResult.AttributeNameCount.Value);
-            Assert.AreEqual<int>(expectedAttributeValueCount, domainMetadataResult.AttributeValueCount.Value);
-            Assert.IsNotNull(domainMetadataResult.Timestamp);
-        }
-
-        private void TestGetAttributes()
-        {
-            GetAttributesRequest request = new GetAttributesRequest()
-            {
-                DomainName = domainName,
-                ItemName = FOO_ITEM.Name,
-                AttributeNames = new List<string>() { FOO_ITEM.Attributes[0].Name, FOO_ITEM.Attributes[1].Name },
-                ConsistentRead = true
-            };
-
-            var getAttributesResult = Client.GetAttributes(request);
-            List<Amazon.SimpleDB.Model.Attribute> attributes = getAttributesResult.Attributes;
-            Dictionary<string, string> attributeValuesByName = ConvertAttributesToMap(attributes);
-
-            Assert.AreEqual<int>(2, attributeValuesByName.Count);
-
-            List<ReplaceableAttribute> attrs = new List<ReplaceableAttribute>();
-            attrs.Add(FOO_ITEM.Attributes[0]);
-            attrs.Add(FOO_ITEM.Attributes[1]);
-
-            foreach (ReplaceableAttribute expectedAttribute in attrs)
-            {
-                string expectedAttributeName = expectedAttribute.Name;
-                Assert.IsTrue(attributeValuesByName.ContainsKey(expectedAttributeName));
-                Assert.AreEqual<string>(expectedAttribute.Value, attributeValuesByName[expectedAttributeName]);
-            }
-        }
-
-        private void TestDeleteAttributes()
-        {
-            List<string> attributeNames = new List<string>();
-            attributeNames.Add(FOO_ITEM.Attributes[0].Name);
-            attributeNames.Add(FOO_ITEM.Attributes[1].Name);
-
-            List<Amazon.SimpleDB.Model.Attribute> attributeList = new List<Amazon.SimpleDB.Model.Attribute>();
-
-            foreach (string attributeName in attributeNames)
-            {
-                attributeList.Add(new Amazon.SimpleDB.Model.Attribute() { Name = attributeName });
-            }
-
-            Assert.IsTrue(DoAttributesExistForItem(Client, FOO_ITEM.Name, domainName, attributeNames));
-
-            DeleteAttributesRequest request = new DeleteAttributesRequest()
-            {
-                DomainName = domainName,
-                ItemName = FOO_ITEM.Name,
-                Attributes = attributeList
-            };
-
-            Client.DeleteAttributes(request);
-            Assert.IsFalse(DoAttributesExistForItem(Client, FOO_ITEM.Name, domainName, attributeNames));
-        }
-
-        bool DoesDomainExist(String domainName)
-        {
-            try
-            {
-                DomainMetadataRequest request = new DomainMetadataRequest() { DomainName = domainName };
-                Client.DomainMetadata(request);
-                return true;
-            }
-            catch (AmazonSimpleDBException)
-            {
-                return false;
-            }
-        }
-
-        void CreateDomain(String domainName)
-        {
-            CreateDomainRequest request = new CreateDomainRequest() { DomainName = domainName };
-            Client.CreateDomain(request);
-        }
-
-        bool DoAttributesExistForItem(IAmazonSimpleDB sdb, String itemName, String domainName, List<String> attributeNames)
-        {
-            GetAttributesRequest request = new GetAttributesRequest()
-            {
-                DomainName = domainName,
-                AttributeNames = attributeNames,
-                ItemName = itemName,
-                ConsistentRead = true
-            };
-
-            var result = sdb.GetAttributes(request);
-            Dictionary<string, string> attributeValuesByName = ConvertAttributesToMap(result.Attributes);
-
-            foreach (string expectedAttributeName in attributeNames)
-            {
-                if (!attributeValuesByName.ContainsKey(expectedAttributeName))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        Dictionary<string, string> ConvertAttributesToMap(List<Amazon.SimpleDB.Model.Attribute> attributeList)
-        {
-            Dictionary<string, string> attributeValuesByName = new Dictionary<string, string>();
-            
-            if (attributeList != null)
-            {
-                foreach (Amazon.SimpleDB.Model.Attribute attribute in attributeList)
-                {
-                    attributeValuesByName.Add(attribute.Name, attribute.Value);
-                }
-            }
-            return attributeValuesByName;
-        }
-
-        static void DeleteDomain(String domainName)
-        {
-            DeleteDomainRequest request = new DeleteDomainRequest()
-            {
-                DomainName = domainName,
-            };
-            Client.DeleteDomain(request);
-        }
-
-        void assertItemsStoredInDomain(IAmazonSimpleDB sdb, List<ReplaceableItem> expectedItems, String domainName)
-        {
-            SelectRequest request = new SelectRequest()
-            {
-                SelectExpression = "select * from `" + domainName + "`",
-                ConsistentRead = true
-            };
-            var selectResult = Client.Select(request);
-            AssertItemsPresent(expectedItems, selectResult.Items);
-        }
-
-        void AssertItemsPresent(List<ReplaceableItem> expectedItems, List<Item> items)
-        {
-            Dictionary<string, Dictionary<string, string>> expectedAttributesByItemName = ConvertReplaceableItemListToMap(expectedItems);
-            Dictionary<string, Dictionary<string, string>> retrievedAttributesByItemName = ConvertItemListToMap(items);
-
-            foreach (string expectedItemName in expectedAttributesByItemName.Keys)
-            {
-                Assert.IsTrue(retrievedAttributesByItemName.ContainsKey(expectedItemName));
-                Dictionary<string, string> expectedAttributes = expectedAttributesByItemName[expectedItemName];
-                Dictionary<string, string> retrievedAttributes = retrievedAttributesByItemName[expectedItemName];
-
-                foreach (string expectedAttributeName in expectedAttributes.Keys)
-                {
-                    string expectedAttributeValue = expectedAttributes[expectedAttributeName];
-                    Assert.IsTrue(retrievedAttributes.ContainsKey(expectedAttributeName));
-                    Assert.AreEqual<string>(expectedAttributeValue, retrievedAttributes[expectedAttributeName]);
-                }
-
-            }
-        }
-
-        private Dictionary<string, Dictionary<string, string>> ConvertReplaceableItemListToMap(List<ReplaceableItem> items)
-        {
-            Dictionary<string, Dictionary<string, string>> attributesByItemName = new Dictionary<string, Dictionary<string, string>>();
-
-            foreach (ReplaceableItem item in items)
-            {
-                Dictionary<string, string> attributeValuesByName = new Dictionary<string, string>();
-                foreach (ReplaceableAttribute attribute in item.Attributes)
-                {
-                    attributeValuesByName.Add(attribute.Name, attribute.Value);
-                }
-                attributesByItemName.Add(item.Name, attributeValuesByName);
-            }
-            return attributesByItemName;
-        }
-
-        private Dictionary<string, Dictionary<string, string>> ConvertItemListToMap(List<Item> items)
-        {
-            Dictionary<string, Dictionary<string, string>> attributesByItemName = new Dictionary<string, Dictionary<string, string>>();
-            foreach (Item item in items)
-            {
-                attributesByItemName.Add(item.Name, ConvertAttributesToMap(item.Attributes));
-            }
-
-            return attributesByItemName;
-        }
-    }
-}
diff --git a/sdk/test/Services/SimpleEmail/IntegrationTests/AWSSDK.IntegrationTests.SimpleEmail.NetFramework.csproj b/sdk/test/Services/SimpleEmail/IntegrationTests/AWSSDK.IntegrationTests.SimpleEmail.NetFramework.csproj
deleted file mode 100644
index 6fcf7b07fb0e..000000000000
--- a/sdk/test/Services/SimpleEmail/IntegrationTests/AWSSDK.IntegrationTests.SimpleEmail.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.SimpleEmail.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.SimpleEmail.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/SimpleEmail/AWSSDK.SimpleEmail.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/SimpleEmail/IntegrationTests/Config/462/App.config b/sdk/test/Services/SimpleEmail/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/SimpleEmail/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs b/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs
deleted file mode 100644
index c8b6ecdeefa7..000000000000
--- a/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using AWSSDK_DotNet.IntegrationTests.Utils;
-
-using Amazon.SimpleEmail;
-using Amazon.SimpleEmail.Model;
-
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class SimpleEmail : TestBase<AmazonSimpleEmailServiceClient>
-    {
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        // To run this test uncomment the TestMethod attribute and use
-        // valid email ids for sourceAddress and destinationAddress.
-        //[TestMethod]        
-        [TestCategory("SimpleEmail")]
-        public void TestSendEmail()
-        {
-            // Replace these email with valid emails.
-            var sourceAddress = "bruce@example.com";
-            var destinationAddress = "alice@example.com";
-
-            // verify email addresses, both source and destination
-            VerifyEmails(sourceAddress, destinationAddress);
-
-            // send email
-            var sendEmailRequest = new SendEmailRequest
-            {
-                Source = sourceAddress,
-                Destination = new Destination
-                {
-                    ToAddresses = new List<string> { destinationAddress }
-                },
-                Message = new Message
-                {
-                    Subject = new Content("Re: Monday meeting"),
-                    Body = new Body
-                    {
-                        Html = new Content(@"<h2>Meeting on Monday</h2> <br/> Monday's meeting to discuss <b>intern projects</b> <br/> Let's start at 9:30am.")
-                    }
-                }
-            };
-            Client.SendEmail(sendEmailRequest);
-        }
-
-        public static void VerifyEmails(params string[] emails)
-        {
-            // start verification process for all email addresses
-            foreach (var email in emails)
-            {
-                Client.VerifyEmailIdentity(new VerifyEmailIdentityRequest
-                {
-                    EmailAddress = email
-                });
-            }
-
-            // wait until all are verified, maximum wait time of two minutes
-            bool allVerified = true;
-            DateTime latest = DateTime.UtcNow + TimeSpan.FromMinutes(2);
-            while(DateTime.UtcNow < latest)
-            {
-                // get verification status for all emails
-                var verificationAttributes = Client.GetIdentityVerificationAttributes(new GetIdentityVerificationAttributesRequest
-                {
-                    Identities = new List<string>(emails)
-                }).VerificationAttributes;
-
-                // test verification status
-                allVerified = true;
-                foreach (var email in emails)
-                {
-                    var attribute = verificationAttributes[email];
-                    if (attribute.VerificationStatus != VerificationStatus.Success)
-                        allVerified = false;
-                }
-
-                if (allVerified)
-                    break;
-
-                System.Threading.Thread.Sleep(TimeSpan.FromSeconds(15));
-            }
-
-            if (!allVerified)
-                throw new InvalidOperationException("Not all email addresses have been verified");
-        }
-    }
-}
\ No newline at end of file
diff --git a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/AWSSDK.IntegrationTests.SimpleSystemsManagement.NetFramework.csproj b/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/AWSSDK.IntegrationTests.SimpleSystemsManagement.NetFramework.csproj
deleted file mode 100644
index 54a6542ea22b..000000000000
--- a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/AWSSDK.IntegrationTests.SimpleSystemsManagement.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.SimpleSystemsManagement.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.SimpleSystemsManagement.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/SimpleSystemsManagement/AWSSDK.SimpleSystemsManagement.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/Config/462/App.config b/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/SimpleSystemsManagement.cs b/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/SimpleSystemsManagement.cs
deleted file mode 100644
index 6e9a6809f4f4..000000000000
--- a/sdk/test/Services/SimpleSystemsManagement/IntegrationTests/SimpleSystemsManagement.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.SimpleSystemsManagement;
-using Amazon.SimpleSystemsManagement.Model;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class SimpleSystemsManagement : TestBase<AmazonSimpleSystemsManagementClient>
-    {
-        [TestMethod]
-        [TestCategory("SimpleSystemsManagement")]
-        public void TestListDocuments()
-        {
-            var response = Client.ListDocuments();
-            Assert.IsNotNull(response);
-
-            // if test a/c had some documents, iterate through
-            // to verify marshal
-            if (response.DocumentIdentifiers.Count > 0)
-            {
-                foreach (var d in response.DocumentIdentifiers)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(d.Name));
-                }
-            }
-        }
-    }
-}
diff --git a/sdk/test/Services/SimpleWorkflow/IntegrationTests/AWSSDK.IntegrationTests.SimpleWorkflow.NetFramework.csproj b/sdk/test/Services/SimpleWorkflow/IntegrationTests/AWSSDK.IntegrationTests.SimpleWorkflow.NetFramework.csproj
deleted file mode 100644
index 61db54777e0b..000000000000
--- a/sdk/test/Services/SimpleWorkflow/IntegrationTests/AWSSDK.IntegrationTests.SimpleWorkflow.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.SimpleWorkflow.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.SimpleWorkflow.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/SimpleWorkflow/AWSSDK.SimpleWorkflow.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/SimpleWorkflow/IntegrationTests/Config/462/App.config b/sdk/test/Services/SimpleWorkflow/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/SimpleWorkflow/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/SimpleWorkflow/IntegrationTests/SimpleWorkflow.cs b/sdk/test/Services/SimpleWorkflow/IntegrationTests/SimpleWorkflow.cs
deleted file mode 100644
index 97a38798c7ce..000000000000
--- a/sdk/test/Services/SimpleWorkflow/IntegrationTests/SimpleWorkflow.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Amazon.SimpleWorkflow;
-using Amazon.SimpleWorkflow.Model;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class SimpleWorkflow : TestBase<AmazonSimpleWorkflowClient>
-    {
-        [TestMethod]
-        [TestCategory("SimpleWorkflow")]
-        public void SmokeTest()
-        {
-            var listDomainsRequest = new ListDomainsRequest
-            {
-                RegistrationStatus = RegistrationStatus.REGISTERED
-            };
-            var listDomainsResponse = Client.ListDomains(listDomainsRequest);
-            Assert.AreEqual(listDomainsResponse.HttpStatusCode, System.Net.HttpStatusCode.OK);
-        }
-    }
-}
diff --git a/sdk/test/Services/Snowball/IntegrationTests/AWSSDK.IntegrationTests.Snowball.NetFramework.csproj b/sdk/test/Services/Snowball/IntegrationTests/AWSSDK.IntegrationTests.Snowball.NetFramework.csproj
deleted file mode 100644
index 75f87e0e3ecf..000000000000
--- a/sdk/test/Services/Snowball/IntegrationTests/AWSSDK.IntegrationTests.Snowball.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.Snowball.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.Snowball.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/Snowball/AWSSDK.Snowball.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/Snowball/IntegrationTests/Config/462/App.config b/sdk/test/Services/Snowball/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/Snowball/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/Snowball/IntegrationTests/Snowball.cs b/sdk/test/Services/Snowball/IntegrationTests/Snowball.cs
deleted file mode 100644
index a97f9ee8a60c..000000000000
--- a/sdk/test/Services/Snowball/IntegrationTests/Snowball.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon;
-using Amazon.Snowball;
-using Amazon.Snowball.Model;
-using Amazon.Runtime;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class Snowball : TestBase<AmazonSnowballClient>
-    {
-        [TestMethod]
-        [TestCategory("Snowball")]
-        public void ListJobs()
-        {
-            var client = new AmazonSnowballClient(Amazon.RegionEndpoint.EUCentral1);
-            client.ListJobs(new ListJobsRequest());
-        }
-
-        [TestMethod]
-        [TestCategory("Snowball")]
-        public void GetSnowballUsage()
-        {
-            var client = new AmazonSnowballClient(Amazon.RegionEndpoint.EUCentral1);
-            var response = client.GetSnowballUsage(new GetSnowballUsageRequest());
-        }
-    }
-}
diff --git a/sdk/test/Services/StorageGateway/IntegrationTests/AWSSDK.IntegrationTests.StorageGateway.NetFramework.csproj b/sdk/test/Services/StorageGateway/IntegrationTests/AWSSDK.IntegrationTests.StorageGateway.NetFramework.csproj
deleted file mode 100644
index 5781bce7252b..000000000000
--- a/sdk/test/Services/StorageGateway/IntegrationTests/AWSSDK.IntegrationTests.StorageGateway.NetFramework.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;BCL;ASYNC_AWAIT;LOCAL_FILE</DefineConstants>
-    <DebugType>portable</DebugType>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <AssemblyName>AWSSDK.IntegrationTests.StorageGateway.NetFramework</AssemblyName>
-    <PackageId>AWSSDK.IntegrationTests.StorageGateway.NetFramework</PackageId>
-
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="**/obj/**" />
-    <None Remove="**/obj/**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-
-    <PackageReference Include="System.Data.SQLite" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.EF6" Version="1.0.97" />
-    <PackageReference Include="System.Data.SQLite.Linq" Version="1.0.97" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../../../IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Core/AWSSDK.Core.NetFramework.csproj" />
-    <ProjectReference Include="../../../../src/Services/StorageGateway/AWSSDK.StorageGateway.NetFramework.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sdk/test/Services/StorageGateway/IntegrationTests/Config/462/App.config b/sdk/test/Services/StorageGateway/IntegrationTests/Config/462/App.config
deleted file mode 100644
index e42d0bcd4c11..000000000000
--- a/sdk/test/Services/StorageGateway/IntegrationTests/Config/462/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="aws" type="Amazon.AWSSection, AWSSDK.Core" />
-  </configSections>
-  <appSettings>
-    <add key="AWSRegion" value="us-east-1" />
-    <add key="AWSProfileName" value="default" />
-    <add key="AWSLogging" value="SystemDiagnostics" />
-    <add key="AWSResponseLogging" value="OnError" />
-    <add key="AWSLogMetrics" value="true" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" />
-    <sources>
-      <source name="Amazon">
-        <listeners>
-          <!--<add name="text" type="System.Diagnostics.TextWriterTraceListener" initializeData="tests-log.txt" />-->
-          <!--<add name="console" type="System.Diagnostics.ConsoleTraceListener" traceOutputOptions="DateTime"/>-->
-          <add name="console" type="AWSSDK_DotNet.IntegrationTests.Utils.ConsoleTraceListener, AWSSDK.IntegrationTestUtilities.NetFramework"/>
-        </listeners>
-      </source>
-    </sources>
-  </system.diagnostics>
-  <aws correctForClockSkew="true">
-    <s3 useSignatureVersion4="true"/>
-  </aws>
-</configuration>
diff --git a/sdk/test/Services/StorageGateway/IntegrationTests/StorageGateway.cs b/sdk/test/Services/StorageGateway/IntegrationTests/StorageGateway.cs
deleted file mode 100644
index 3a20e9e5e68d..000000000000
--- a/sdk/test/Services/StorageGateway/IntegrationTests/StorageGateway.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.StorageGateway;
-
-namespace AWSSDK_DotNet.IntegrationTests.Tests
-{
-    [TestClass]
-    public class StorageGateway : TestBase<AmazonStorageGatewayClient>
-    {
-
-        [ClassCleanup]
-        public static void Cleanup()
-        {
-            BaseClean();
-        }
-
-        [TestMethod]
-        [TestCategory("StorageGateway")]
-        public void TestListGateways()
-        {
-            var response = Client.ListGateways();
-
-            Assert.IsNotNull(response);
-            Assert.IsNotNull(response.Gateways);
-
-            // test a/c may not have any gateways but if some are returned, make
-            // sure they marshalled ok
-            if (response.Gateways.Count > 0)
-            {
-                foreach (var gi in response.Gateways)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(gi.GatewayARN));
-                }
-            }
-        }
-
-        [TestMethod]
-        [TestCategory("StorageGateway")]
-        public void TestDescribeTapeArchives()
-        {
-            var response = Client.DescribeTapeArchives();
-            Assert.IsNotNull(response);
-            Assert.IsNotNull(response.TapeArchives);
-
-            // test a/c may not have any archives but if some are returned, make
-            // sure they marshalled ok
-            if (response.TapeArchives.Count > 0)
-            {
-                foreach (var ta in response.TapeArchives)
-                {
-                    Assert.IsFalse(string.IsNullOrEmpty(ta.TapeARN));
-                }
-            }
-        }
-    }
-}