diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_custom_base_uri_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_custom_base_uri_tests.py
index c976b74e71e41..ba82c73fa906d 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_custom_base_uri_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_custom_base_uri_tests.py
@@ -48,9 +48,7 @@
 from msrest.exceptions import DeserializationError, SerializationError, ClientRequestError
 from msrest.authentication import BasicTokenAuthentication
 
-from autorestparameterizedhosttestclient import (
-    AutoRestParameterizedHostTestClient,
-    AutoRestParameterizedHostTestClientConfiguration)
+from autorestparameterizedhosttestclient import AutoRestParameterizedHostTestClient
 
 from autorestparameterizedhosttestclient.exceptions import ValidationError
 from autorestparameterizedhosttestclient.models import Error, ErrorException
@@ -60,19 +58,13 @@ class CustomBaseUriTests(unittest.TestCase):
     
     def test_custom_base_uri_positive(self):
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestParameterizedHostTestClientConfiguration(cred, host="host:3000")
-
-        config.log_level = log_level
-        client = AutoRestParameterizedHostTestClient(config)
+        client = AutoRestParameterizedHostTestClient(cred, host="host:3000")
         client.paths.get_empty("local")
 
     def test_custom_base_uri_negative(self):
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestParameterizedHostTestClientConfiguration(cred, host="host:3000")
-
-        config.log_level = log_level
-        config.retry_policy.retries = 0
-        client = AutoRestParameterizedHostTestClient(config)
+        client = AutoRestParameterizedHostTestClient(cred, host="host:3000")
+        client.config.retry_policy.retries = 0
         with self.assertRaises(ClientRequestError):
             client.paths.get_empty("bad")
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_url_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_url_tests.py
index 9d142ace09c9a..bb9128e84f9b5 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_url_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/azure_url_tests.py
@@ -48,9 +48,7 @@
 from msrest.exceptions import DeserializationError
 from msrest.authentication import BasicTokenAuthentication
 
-from microsoftazuretesturl import (
-    MicrosoftAzureTestUrl, 
-    MicrosoftAzureTestUrlConfiguration)
+from microsoftazuretesturl import MicrosoftAzureTestUrl
 
 from microsoftazuretesturl.models import ErrorException, SampleResourceGroup
 
@@ -62,10 +60,7 @@ def test_azure_url(self):
         client_id = str(uuid4())
         
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = MicrosoftAzureTestUrlConfiguration(cred, sub_id, base_url="http://localhost:3000")
-
-        config.log_level = log_level
-        client = MicrosoftAzureTestUrl(config)
+        client = MicrosoftAzureTestUrl(cred, sub_id, base_url="http://localhost:3000")
 
         group = client.group.get_sample_resource_group("testgoup101")
         self.assertEqual(group.name, "testgroup101")
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/duration_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/duration_tests.py
index 92772e875a2cd..44f68c78789d1 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/duration_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/duration_tests.py
@@ -48,9 +48,7 @@
 from msrest.exceptions import DeserializationError
 from msrest.authentication import BasicTokenAuthentication
 
-from autorestdurationtestservice import (
-    AutoRestDurationTestService, 
-    AutoRestDurationTestServiceConfiguration)
+from autorestdurationtestservice import AutoRestDurationTestService
 
 
 class DurationTests(unittest.TestCase):
@@ -58,9 +56,7 @@ class DurationTests(unittest.TestCase):
     def test_duration(self):
 
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestDurationTestServiceConfiguration(cred, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestDurationTestService(config)
+        client = AutoRestDurationTestService(cred, base_url="http://localhost:3000")
 
         self.assertIsNone(client.duration.get_null())
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/head_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/head_tests.py
index fe3ffda536882..bfbebb5e36bd1 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/head_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/head_tests.py
@@ -50,23 +50,15 @@
 from msrest.authentication import BasicTokenAuthentication
 from msrestazure.azure_exceptions import CloudError, CloudErrorData
 
-from autorestheadtestservice import (
-    AutoRestHeadTestService, 
-    AutoRestHeadTestServiceConfiguration)
-
-from autorestheadexceptiontestservice import (
-    AutoRestHeadExceptionTestService, 
-    AutoRestHeadExceptionTestServiceConfiguration)
+from autorestheadtestservice import AutoRestHeadTestService
+from autorestheadexceptiontestservice import AutoRestHeadExceptionTestService
 
 class HeadTests(unittest.TestCase):
 
     def test_head(self):
         
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestHeadTestServiceConfiguration(cred, base_url="http://localhost:3000")
-
-        config.log_level = log_level
-        client = AutoRestHeadTestService(config)
+        client = AutoRestHeadTestService(cred, base_url="http://localhost:3000")
 
         self.assertTrue(client.http_success.head200())
         self.assertTrue(client.http_success.head204())
@@ -77,10 +69,7 @@ class HeadExceptionTest(unittest.TestCase):
     def test_head_exception(self):
 
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestHeadExceptionTestServiceConfiguration(cred, base_url="http://localhost:3000")
-
-        config.log_level = log_level
-        client = AutoRestHeadExceptionTestService(config)
+        client = AutoRestHeadExceptionTestService(cred, base_url="http://localhost:3000")
 
         client.head_exception.head200()
         client.head_exception.head204()
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/lro_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/lro_tests.py
index 7e52e686bda1a..39ef060fbe527 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/lro_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/lro_tests.py
@@ -49,10 +49,7 @@
 from msrest.authentication import BasicTokenAuthentication
 from msrestazure.azure_exceptions import CloudError, CloudErrorData
 
-from autorestlongrunningoperationtestservice import (
-    AutoRestLongRunningOperationTestService, 
-    AutoRestLongRunningOperationTestServiceConfiguration)
-
+from autorestlongrunningoperationtestservice import AutoRestLongRunningOperationTestService
 from autorestlongrunningoperationtestservice.models import *
 
 class LroTests(unittest.TestCase):
@@ -60,10 +57,7 @@ class LroTests(unittest.TestCase):
     def setUp(self):
 
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestLongRunningOperationTestServiceConfiguration(cred, base_url="http://localhost:3000")
-
-        config.log_level = log_level
-        self.client = AutoRestLongRunningOperationTestService(config)
+        self.client = AutoRestLongRunningOperationTestService(cred, base_url="http://localhost:3000")
 
         self.client.config.long_running_operation_timeout = 0
         self.client._client._adapter.add_hook("request", self.client._client._adapter._test_pipeline)
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/paging_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/paging_tests.py
index 115c5278b1145..38b4c3391bda8 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/paging_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/paging_tests.py
@@ -49,18 +49,14 @@
 from msrestazure.azure_exceptions import CloudError
 from msrest.authentication import BasicTokenAuthentication
 
-from autorestpagingtestservice import (
-    AutoRestPagingTestService, 
-    AutoRestPagingTestServiceConfiguration)
+from autorestpagingtestservice import AutoRestPagingTestService
 from autorestpagingtestservice.models import PagingGetMultiplePagesWithOffsetOptions 
 
 class PagingTests(unittest.TestCase):
 
     def setUp(self):
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestPagingTestServiceConfiguration(cred, base_url="http://localhost:3000")
-        config.log_level = log_level
-        self.client = AutoRestPagingTestService(config)
+        self.client = AutoRestPagingTestService(cred, base_url="http://localhost:3000")
         self.client._client._adapter.add_hook("request", self.client._client._adapter._test_pipeline)
         return super(PagingTests, self).setUp()
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/parameter_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/parameter_tests.py
index 56b5b87993e26..b0bac37f2bb2c 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/parameter_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/parameter_tests.py
@@ -49,13 +49,17 @@
 sys.path.append(join(tests, "AzureSpecials"))
 from msrest.exceptions import DeserializationError
 
-from autorestparametergroupingtestservice import AutoRestParameterGroupingTestServiceConfiguration, AutoRestParameterGroupingTestService
-from microsoftazuretesturl import MicrosoftAzureTestUrl, MicrosoftAzureTestUrlConfiguration
-from autorestdurationtestservice import AutoRestDurationTestService, AutoRestDurationTestServiceConfiguration 
-from autorestazurespecialparameterstestclient import AutoRestAzureSpecialParametersTestClient, AutoRestAzureSpecialParametersTestClientConfiguration
+from autorestparametergroupingtestservice import AutoRestParameterGroupingTestService
+from microsoftazuretesturl import MicrosoftAzureTestUrl
+from autorestdurationtestservice import AutoRestDurationTestService 
+from autorestazurespecialparameterstestclient import AutoRestAzureSpecialParametersTestClient
 
 from autorestparameterizedhosttestclient.exceptions import ValidationError
-from autorestparametergroupingtestservice.models import ParameterGroupingPostMultiParamGroupsSecondParamGroup, ParameterGroupingPostOptionalParameters, ParameterGroupingPostRequiredParameters, FirstParameterGroup
+from autorestparametergroupingtestservice.models import (
+    ParameterGroupingPostMultiParamGroupsSecondParamGroup,
+    ParameterGroupingPostOptionalParameters,
+    ParameterGroupingPostRequiredParameters,
+    FirstParameterGroup)
 
 from msrest.authentication import BasicTokenAuthentication
 
@@ -71,9 +75,7 @@ def test_parameter_grouping(self):
         pathParameter = 'path'
 
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestParameterGroupingTestServiceConfiguration(cred, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestParameterGroupingTestService(config)
+        client = AutoRestParameterGroupingTestService(cred, base_url="http://localhost:3000")
 
         # Valid required parameters
         requiredParameters = ParameterGroupingPostRequiredParameters(body=bodyParameter, path=pathParameter, custom_header=headerParameter, query=queryParameter)
@@ -118,9 +120,7 @@ def test_azure_special_parameters(self):
         unencodedPath = 'path1/path2/path3'
         unencodedQuery = 'value1&q2=value2&q3=value3'
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
 
         client.subscription_in_credentials.post_method_global_not_provided_valid()
         client.subscription_in_credentials.post_method_global_valid()
@@ -154,9 +154,7 @@ def test_azure_odata(self):
 
         validSubscription = '1234-5678-9012-3456'
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
         client.odata.get_with_filter(filter="id gt 5 and name eq 'foo'", top=10, orderby="id")
 
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/xms_request_clientid_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/xms_request_clientid_tests.py
index f59b4bec7a249..32b33bf21a195 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/xms_request_clientid_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/xms_request_clientid_tests.py
@@ -49,7 +49,7 @@
 from msrest.authentication import BasicTokenAuthentication
 from msrestazure.azure_exceptions import CloudError, CloudErrorData
 
-from autorestazurespecialparameterstestclient import AutoRestAzureSpecialParametersTestClient, AutoRestAzureSpecialParametersTestClientConfiguration
+from autorestazurespecialparameterstestclient import AutoRestAzureSpecialParametersTestClient
     
 
 class XmsRequestClientIdTests(unittest.TestCase):
@@ -60,9 +60,7 @@ def test_xms_request_client_id(self):
         validClientId = '9C4D50EE-2D56-4CD3-8152-34347DC9F2B0'
 
         cred = BasicTokenAuthentication({"access_token":123})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
 
         custom_headers = {"x-ms-client-request-id": validClientId }
 
@@ -79,9 +77,7 @@ def test_custom_named_request_id(self):
         expectedRequestId = '9C4D50EE-2D56-4CD3-8152-34347DC9F2B0'
 
         cred = BasicTokenAuthentication({"access_token":123})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
 
         response = client.header.custom_named_request_id(expectedRequestId, raw=True)
         self.assertEqual("123", response.response.headers.get("foo-request-id"))
@@ -91,9 +87,7 @@ def test_client_request_id_in_exception(self):
         expectedRequestId = '9C4D50EE-2D56-4CD3-8152-34347DC9F2B0'
 
         cred = BasicTokenAuthentication({"access_token":123})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
 
         try:
             client.xms_client_request_id.get()
@@ -107,10 +101,8 @@ def test_xms_request_client_id_in_client(self):
         expectedRequestId = '9C4D50EE-2D56-4CD3-8152-34347DC9F2B0'
 
         cred = BasicTokenAuthentication({"access_token":123})
-        config = AutoRestAzureSpecialParametersTestClientConfiguration(cred, validSubscription, base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.generate_client_request_id = False
-        client = AutoRestAzureSpecialParametersTestClient(config)
+        client = AutoRestAzureSpecialParametersTestClient(cred, validSubscription, base_url="http://localhost:3000")
+        client.config.generate_client_request_id = False
         client.xms_client_request_id.get()
 
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/zzz_tests.py b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/zzz_tests.py
index bb87f7a73531e..76a9832a022b7 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/zzz_tests.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/AcceptanceTests/zzz_tests.py
@@ -47,7 +47,7 @@
 
 from msrest.exceptions import DeserializationError
 
-from autorestreportserviceforazure import AutoRestReportServiceForAzureConfiguration, AutoRestReportServiceForAzure
+from autorestreportserviceforazure import AutoRestReportServiceForAzure
 from msrest.authentication import BasicTokenAuthentication
 
 
@@ -57,9 +57,7 @@ class AcceptanceTests(unittest.TestCase):
     def test_ensure_coverage(self):
 
         cred = BasicTokenAuthentication({"access_token" :str(uuid4())})
-        config = AutoRestReportServiceForAzureConfiguration(cred, base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestReportServiceForAzure(config)
+        client = AutoRestReportServiceForAzure(cred, base_url="http://localhost:3000")
         report = client.get_report()
 
         skipped = [k for k, v in report.items() if v == 0]
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/array_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/array_tests.py
index 153b8635ecd79..9b14f19b39669 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/array_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/array_tests.py
@@ -45,20 +45,14 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatarrayservice import (
-    AutoRestSwaggerBATArrayService, 
-    AutoRestSwaggerBATArrayServiceConfiguration)
-
+from autorestswaggerbatarrayservice import AutoRestSwaggerBATArrayService
 from autorestswaggerbatarrayservice.models import Product
 
 
 class ArrayTests(unittest.TestCase):
 
     def test_array(self):
-
-        config = AutoRestSwaggerBATArrayServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestSwaggerBATArrayService(config)
+        client = AutoRestSwaggerBATArrayService(base_url="http://localhost:3000")
 
         self.assertListEqual([], client.array.get_empty())
         self.assertIsNone(client.array.get_null())
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/bool_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/bool_tests.py
index 6d3ff7c519968..6f90a1638187c 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/bool_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/bool_tests.py
@@ -45,19 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestbooltestservice import (
-    AutoRestBoolTestService, 
-    AutoRestBoolTestServiceConfiguration)
-
+from autorestbooltestservice import AutoRestBoolTestService
 from autorestbooltestservice.models import ErrorException
 
 class BoolTests(unittest.TestCase):
 
     def test_bool(self):
-
-        config = AutoRestBoolTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestBoolTestService(config)
+        client = AutoRestBoolTestService(base_url="http://localhost:3000")
 
         self.assertTrue(client.bool_model.get_true())
         self.assertFalse(client.bool_model.get_false())
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/byte_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/byte_tests.py
index f61c067d63248..c792f75fbe77c 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/byte_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/byte_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatbyteservice import (
-    AutoRestSwaggerBATByteService, 
-    AutoRestSwaggerBATByteServiceConfiguration)
+from autorestswaggerbatbyteservice import AutoRestSwaggerBATByteService
 
 
 class ByteTests(unittest.TestCase):
 
     def test_byte(self):
-
-        config = AutoRestSwaggerBATByteServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestSwaggerBATByteService(config)
+        client = AutoRestSwaggerBATByteService(base_url="http://localhost:3000")
 
         test_bytes = bytearray([0x0FF, 0x0FE, 0x0FD, 0x0FC, 0x0FB, 0x0FA, 0x0F9, 0x0F8, 0x0F7, 0x0F6])
         client.byte.put_non_ascii(test_bytes)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
index fa4902659e391..2c1e91dd4e755 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
@@ -45,10 +45,7 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError, SerializationError, ValidationError
 
-from autorestcomplextestservice import (
-    AutoRestComplexTestService,
-    AutoRestComplexTestServiceConfiguration)
-
+from autorestcomplextestservice import AutoRestComplexTestService
 from autorestcomplextestservice.models import *
 
 class UTC(tzinfo): 
@@ -65,10 +62,7 @@ def dst(self,dt):
 class ComplexTests(unittest.TestCase):
 
     def test_complex(self):
-
-        config = AutoRestComplexTestServiceConfiguration(base_url="http://localhost:3000",api_version="2015-01-01")
-        config.log_level = log_level
-        client = AutoRestComplexTestService(config)
+        client = AutoRestComplexTestService(base_url="http://localhost:3000",api_version="2015-01-01")
 
         # GET basic/valid
         basic_result = client.basic_operations.get_valid()
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py
index 36d4ba09cf8c7..38c16c2a7a147 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py
@@ -46,30 +46,19 @@
     ClientRequestError,
     ValidationError)
 
-from autorestparameterizedhosttestclient import (
-    AutoRestParameterizedHostTestClient,
-    AutoRestParameterizedHostTestClientConfiguration)
-
+from autorestparameterizedhosttestclient import AutoRestParameterizedHostTestClient
 from autorestparameterizedhosttestclient.models import Error, ErrorException
 
 
 class CustomBaseUriTests(unittest.TestCase):
 
     def test_custom_base_uri_positive(self):
-        config = AutoRestParameterizedHostTestClientConfiguration(
-            "host:3000")
-
-        config.log_level = log_level
-        client = AutoRestParameterizedHostTestClient(config)
+        client = AutoRestParameterizedHostTestClient("host:3000")
         client.paths.get_empty("local")
 
     def test_custom_base_uri_negative(self):
-        config = AutoRestParameterizedHostTestClientConfiguration(
-            "host:3000")
-
-        config.log_level = log_level
-        config.retry_policy.retries = 0
-        client = AutoRestParameterizedHostTestClient(config)
+        client = AutoRestParameterizedHostTestClient("host:3000")
+        client.config.retry_policy.retries = 0
 
         with self.assertRaises(ClientRequestError):
             client.paths.get_empty("bad")
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/date_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/date_tests.py
index a5ef7791aa801..2b836431aeabe 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/date_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/date_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestdatetestservice import (
-    AutoRestDateTestService, 
-    AutoRestDateTestServiceConfiguration)
+from autorestdatetestservice import AutoRestDateTestService
 
 
 class DateTests(unittest.TestCase):
 
     def test_date(self):
-
-        config = AutoRestDateTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestDateTestService(config)
+        client = AutoRestDateTestService(base_url="http://localhost:3000")
 
         max_date = isodate.parse_date("9999-12-31T23:59:59.999999Z")
         min_date = isodate.parse_date("0001-01-01T00:00:00Z")
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_rfc_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_rfc_tests.py
index 778e2c09585b2..e5c8efe8c3bef 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_rfc_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_rfc_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestrfc1123datetimetestservice import (
-    AutoRestRFC1123DateTimeTestService, 
-    AutoRestRFC1123DateTimeTestServiceConfiguration)
+from autorestrfc1123datetimetestservice import AutoRestRFC1123DateTimeTestService
 
 
 class DateTimeRfcTests(unittest.TestCase):
 
     def test_datetime_rfc(self):
-
-        config = AutoRestRFC1123DateTimeTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestRFC1123DateTimeTestService(config)
+        client = AutoRestRFC1123DateTimeTestService(base_url="http://localhost:3000")
 
         self.assertIsNone(client.datetimerfc1123.get_null())
 
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_tests.py
index 929df927e29b4..2217a3783b47c 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/datetime_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError, SerializationError
 
-from autorestdatetimetestservice import (
-    AutoRestDateTimeTestService, 
-    AutoRestDateTimeTestServiceConfiguration)
+from autorestdatetimetestservice import AutoRestDateTimeTestService
 
 
 class DatetimeTests(unittest.TestCase):
 
     def test_datetime(self):
-
-        config = AutoRestDateTimeTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestDateTimeTestService(config)
+        client = AutoRestDateTimeTestService(base_url="http://localhost:3000")
 
         max_date = isodate.parse_datetime("9999-12-31T23:59:59.999999Z")
         min_date = isodate.parse_datetime("0001-01-01T00:00:00Z")
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/dictionary_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/dictionary_tests.py
index 39ec8b5000c8c..fdb8cc180c834 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/dictionary_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/dictionary_tests.py
@@ -42,7 +42,7 @@
 
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatdictionaryservice import AutoRestSwaggerBATdictionaryService, AutoRestSwaggerBATdictionaryServiceConfiguration
+from autorestswaggerbatdictionaryservice import AutoRestSwaggerBATdictionaryService
 from autorestswaggerbatdictionaryservice.models import Widget, ErrorException
 
 
@@ -50,10 +50,7 @@ class DictionaryTests(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-
-        config = AutoRestSwaggerBATdictionaryServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        cls.client = AutoRestSwaggerBATdictionaryService(config)
+        cls.client = AutoRestSwaggerBATdictionaryService(base_url="http://localhost:3000")
         return super(DictionaryTests, cls).setUpClass()
 
     def test_dictionary_primitive_types(self):
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/duration_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/duration_tests.py
index 38367dd9c9361..8ec68c0dd1972 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/duration_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/duration_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestdurationtestservice import (
-    AutoRestDurationTestService, 
-    AutoRestDurationTestServiceConfiguration)
+from autorestdurationtestservice import AutoRestDurationTestService
 
 
 class DurationTests(unittest.TestCase):
 
     def test_duration(self):
-
-        config = AutoRestDurationTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestDurationTestService(config)
+        client = AutoRestDurationTestService(base_url="http://localhost:3000")
 
         self.assertIsNone(client.duration.get_null())
 
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
index 900265a4ed1fe..903d69f3dba2e 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
@@ -44,17 +44,15 @@
 
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatfileservice import AutoRestSwaggerBATFileService, AutoRestSwaggerBATFileServiceConfiguration
+from autorestswaggerbatfileservice import AutoRestSwaggerBATFileService
 from autorestswaggerbatfileservice.models import ErrorException
 
 
 class FileTests(unittest.TestCase):
 
     def test_files(self):
-
-        config = AutoRestSwaggerBATFileServiceConfiguration(base_url="http://localhost:3000")
-        config.connection.data_block_size = 1000
-        client = AutoRestSwaggerBATFileService(config)
+        client = AutoRestSwaggerBATFileService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 1000
 
         def test_callback(data, response, progress=[0]):
             self.assertTrue(len(data) > 0)
@@ -83,7 +81,7 @@ def test_callback(data, response, progress=[0]):
                 sample_data = hash(data.read())
             self.assertEqual(sample_data, hash(file_handle.getvalue()))
 
-        config.connection.data_block_size = 4096
+        client.config.connection.data_block_size = 4096
         file_length = 0
         with io.BytesIO() as file_handle:
             stream = client.files.get_empty_file(callback=test_callback)
@@ -116,8 +114,7 @@ def test_callback(data, response, progress=[0]):
                 progress[0] += len(data)
                 print("Downloading... {}%".format(int(progress[0]*100/total)))
 
-        config = AutoRestSwaggerBATFileServiceConfiguration(base_url="http://localhost:3000")
-        client = AutoRestSwaggerBATFileService(config)
+        client = AutoRestSwaggerBATFileService(base_url="http://localhost:3000")
 
         file_length = 0
         with io.BytesIO() as file_handle:
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
index ea1ed1a726f9e..b1fa2f0cbec90 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
@@ -43,7 +43,7 @@
 
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatformdataservice import AutoRestSwaggerBATFormDataService, AutoRestSwaggerBATFormDataServiceConfiguration
+from autorestswaggerbatformdataservice import AutoRestSwaggerBATFormDataService
 
 class FormDataTests(unittest.TestCase):
 
@@ -63,10 +63,8 @@ def test_callback(data, response, progress = [0]):
             print("Progress... {}%".format(int(progress[0]*100/total)))
             self.assertIsNotNone(response)
 
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.connection.data_block_size = 2
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 2
 
         test_string = "Upload file test case"
         test_bytes = bytearray(test_string, encoding='utf-8')
@@ -86,10 +84,8 @@ def test_callback(data, response, progress = [0]):
             print("Progress... {}%".format(int(progress[0]*100/total)))
             self.assertIsNotNone(response)
 
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.connection.data_block_size = 2
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 2
 
         test_string = "Upload file test case"
         test_bytes = bytearray(test_string, encoding='utf-8')
@@ -109,10 +105,8 @@ def test_callback(data, response, progress = [0]):
             print("Progress... {}%".format(int(progress[0]*100/total)))
             self.assertIsNotNone(response)
 
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.connection.data_block_size = 2
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 2
 
         name = os.path.basename(self.dummy_file)
         result = io.BytesIO()
@@ -131,10 +125,8 @@ def test_callback(data, response, progress = [0]):
             print("Progress... {}%".format(int(progress[0]*100/total)))
             self.assertIsNotNone(response)
 
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.connection.data_block_size = 2
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 2
 
         name = os.path.basename(self.dummy_file)
         result = io.BytesIO()
@@ -158,10 +150,8 @@ def test_callback(data, response, progress = [0]):
             else:
                 print("Uploading... {}%".format(int(progress[0]*100/total)))
 
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.connection.data_block_size = 2
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
+        client.config.connection.data_block_size = 2
         
         result = io.BytesIO()
         with io.BytesIO(test_bytes) as stream_data:
@@ -178,10 +168,7 @@ def test_callback(data, response, progress = [0]):
             self.assertEqual(result.getvalue().decode(), "Test file")
 
     def test_file_body_upload_raw(self):
-
-        config = AutoRestSwaggerBATFormDataServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestSwaggerBATFormDataService(config)
+        client = AutoRestSwaggerBATFormDataService(base_url="http://localhost:3000")
 
         test_string = "Upload file test case"
         test_bytes = bytearray(test_string, encoding='utf-8')
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/header_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/header_tests.py
index 0a77d8dc6efeb..ef5ccdbec97ae 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/header_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/header_tests.py
@@ -45,17 +45,14 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatheaderservice import AutoRestSwaggerBATHeaderService, AutoRestSwaggerBATHeaderServiceConfiguration
+from autorestswaggerbatheaderservice import AutoRestSwaggerBATHeaderService
 from autorestswaggerbatheaderservice.models.auto_rest_swagger_bat_header_service_enums import GreyscaleColors
 
 
 class HeaderTests(unittest.TestCase):
 
     def test_headers(self):
-
-        config = AutoRestSwaggerBATHeaderServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestSwaggerBATHeaderService(config)
+        client = AutoRestSwaggerBATHeaderService(base_url="http://localhost:3000")
 
         client.header.param_integer("positive", 1)
         client.header.param_integer("negative", -2)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/http_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/http_tests.py
index c562609e4307d..3db36e576af8e 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/http_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/http_tests.py
@@ -44,10 +44,7 @@
 
 from msrest.exceptions import DeserializationError, HttpOperationError
 
-from autoresthttpinfrastructuretestservice import (
-    AutoRestHttpInfrastructureTestService,
-    AutoRestHttpInfrastructureTestServiceConfiguration)
-
+from autoresthttpinfrastructuretestservice import AutoRestHttpInfrastructureTestService
 from autoresthttpinfrastructuretestservice.models import (
     A, B, C, D, ErrorException)
 
@@ -55,10 +52,8 @@
 class HttpTests(unittest.TestCase):
     
     def setUp(self):
-        config = AutoRestHttpInfrastructureTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        config.retry_policy.retries = 3
-        self.client = AutoRestHttpInfrastructureTestService(config)
+        self.client = AutoRestHttpInfrastructureTestService(base_url="http://localhost:3000")
+        self.client.config.retry_policy.retries = 3
         self.client._client._adapter.add_hook("request", self.client._client._adapter._test_pipeline)
         return super(HttpTests, self).setUp()
 
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/integer_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/integer_tests.py
index dec0ba58003d6..9b41bc6817ac1 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/integer_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/integer_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestintegertestservice import (
-    AutoRestIntegerTestService, 
-    AutoRestIntegerTestServiceConfiguration)
+from autorestintegertestservice import AutoRestIntegerTestService
 
 
 class IntegerTests(unittest.TestCase):
 
     def test_integer(self):
-
-        config = AutoRestIntegerTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestIntegerTestService(config)
+        client = AutoRestIntegerTestService(base_url="http://localhost:3000")
 
         client.int_model.put_max32(2147483647) # sys.maxint
         client.int_model.put_min32(-2147483648)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/model_flattening_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/model_flattening_tests.py
index f15c8d90a2c92..bb79352d8d754 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/model_flattening_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/model_flattening_tests.py
@@ -45,10 +45,7 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestresourceflatteningtestservice import (
-    AutoRestResourceFlatteningTestService, 
-    AutoRestResourceFlatteningTestServiceConfiguration)
-
+from autorestresourceflatteningtestservice import AutoRestResourceFlatteningTestService
 from autorestresourceflatteningtestservice.models import (
     FlattenedProduct,
     ErrorException,
@@ -59,10 +56,7 @@
 class ModelFlatteningTests(unittest.TestCase):
 
     def setUp(self):
-        config = AutoRestResourceFlatteningTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        self.client = AutoRestResourceFlatteningTestService(config)
-
+        self.client = AutoRestResourceFlatteningTestService(base_url="http://localhost:3000")
         return super(ModelFlatteningTests, self).setUp()
 
     def test_flattening_array(self):
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/number_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/number_tests.py
index a38a02f81f0db..c3cc2bdea971b 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/number_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/number_tests.py
@@ -45,18 +45,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestnumbertestservice import (
-    AutoRestNumberTestService, 
-    AutoRestNumberTestServiceConfiguration)
+from autorestnumbertestservice import AutoRestNumberTestService
 
 
 class NumberTests(unittest.TestCase):
 
     def test_numbers(self):
-
-        config = AutoRestNumberTestServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestNumberTestService(config)
+        client = AutoRestNumberTestService(base_url="http://localhost:3000")
 
         client.number.put_big_float(3.402823e+20)
         client.number.put_small_float(3.402823e-20)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/required_optional_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/required_optional_tests.py
index b8da49a9412dd..28c881cf48528 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/required_optional_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/required_optional_tests.py
@@ -42,10 +42,7 @@
 
 from msrest.exceptions import DeserializationError, SerializationError, ValidationError
 
-from autorestrequiredoptionaltestservice import (
-    AutoRestRequiredOptionalTestService,
-    AutoRestRequiredOptionalTestServiceConfiguration)
-
+from autorestrequiredoptionaltestservice import AutoRestRequiredOptionalTestService
 from autorestrequiredoptionaltestservice.models import StringWrapper, ArrayWrapper, ClassWrapper
 
 
@@ -53,14 +50,10 @@ class RequiredOptionalTests(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-
-        config = AutoRestRequiredOptionalTestServiceConfiguration(
+        cls.client = AutoRestRequiredOptionalTestService(
             "required_path",
             "required_query",
             base_url="http://localhost:3000")
-
-        config.log_level = log_level
-        cls.client = AutoRestRequiredOptionalTestService(config)
         return super(RequiredOptionalTests, cls).setUpClass()
 
     def test_required_optional(self):
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/string_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/string_tests.py
index 003aebc3a9168..6c4e1e2ca5af1 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/string_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/string_tests.py
@@ -46,19 +46,13 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError
 
-from autorestswaggerbatservice import (
-    AutoRestSwaggerBATService, 
-    AutoRestSwaggerBATServiceConfiguration)
-
+from autorestswaggerbatservice import AutoRestSwaggerBATService
 from autorestswaggerbatservice.models.auto_rest_swagger_bat_service_enums import *
 
 class StringTests(unittest.TestCase):
 
     def test_string(self):
-
-        config = AutoRestSwaggerBATServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestSwaggerBATService(config)
+        client = AutoRestSwaggerBATService(base_url="http://localhost:3000")
 
         self.assertIsNone(client.string.get_null())
         client.string.put_null(None)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
index 3204669e8568c..89d714388f71b 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
@@ -43,7 +43,7 @@
 
 from msrest.exceptions import DeserializationError, ValidationError
 
-from autoresturltestservice import AutoRestUrlTestService, AutoRestUrlTestServiceConfiguration
+from autoresturltestservice import AutoRestUrlTestService
 from autoresturltestservice.models.auto_rest_url_test_service_enums import UriColor
 
 
@@ -51,10 +51,7 @@ class UrlTests(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-
-        config = AutoRestUrlTestServiceConfiguration('', base_url="http://localhost:3000")
-        config.log_level = log_level
-        cls.client = AutoRestUrlTestService(config)
+        cls.client = AutoRestUrlTestService('', base_url="http://localhost:3000")
         return super(UrlTests, cls).setUpClass()
 
     def test_url_path(self):
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
index 7e1ba54e0556e..2d5eb21d928e7 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
@@ -45,9 +45,7 @@
 from msrest.serialization import Deserializer
 from msrest.exceptions import DeserializationError, ValidationError
 
-from autorestvalidationtest import (
-    AutoRestValidationTest,
-    AutoRestValidationTestConfiguration)
+from autorestvalidationtest import AutoRestValidationTest
 from autorestvalidationtest.models import (
     Product,
     ConstantProduct,
@@ -57,13 +55,10 @@
 class ValidationTests(unittest.TestCase):
 
     def test_constant_values(self):
-
-        config = AutoRestValidationTestConfiguration(
+        client = AutoRestValidationTest(
             "abc123",
             "12-34-5678",
             base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestValidationTest(config)
 
         client.get_with_constant_in_path()
 
@@ -72,13 +67,10 @@ def test_constant_values(self):
         self.assertIsNotNone(product)
 
     def test_validation(self):
-
-        config = AutoRestValidationTestConfiguration(
+        client = AutoRestValidationTest(
             "abc123",
             "12-34-5678",
             base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestValidationTest(config)
 
         try:
             client.validation_of_method_parameters("1", 100)
@@ -138,12 +130,10 @@ def test_validation(self):
             self.assertEqual(err.rule, "max_items")
             self.assertEqual(err.target, "display_names")
 
-        config2 = AutoRestValidationTestConfiguration(
+        client2 = AutoRestValidationTest(
             "abc123",
             "abc",
             base_url="http://localhost:3000")
-        config2.log_level = log_level
-        client2 = AutoRestValidationTest(config2)
 
         try:
             client2.validation_of_method_parameters("123", 150)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
index 2afd6aa9c3c70..0accfbac70edc 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
@@ -41,17 +41,13 @@
 sys.path.append(join(tests, "Report"))
 
 
-from autorestreportservice import (
-    AutoRestReportService, 
-    AutoRestReportServiceConfiguration)
+from autorestreportservice import AutoRestReportService
 
 
 class AcceptanceTests(unittest.TestCase):
-    def test_ensure_coverage(self):
 
-        config = AutoRestReportServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
-        client = AutoRestReportService(config)
+    def test_ensure_coverage(self):
+        client = AutoRestReportService(base_url="http://localhost:3000")
         report = client.get_report()
 
         # Add tests that wont be supported due to the nature of Python here