diff --git a/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py b/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py
index ced158b..60ad09b 100644
--- a/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py
+++ b/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py
@@ -103,7 +103,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id
diff --git a/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py b/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py
index b964012..825454b 100644
--- a/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py
+++ b/tests/unit/gapic/containeranalysis_v1/test_container_analysis.py
@@ -256,20 +256,20 @@ def test_container_analysis_client_client_options(
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -338,7 +338,7 @@ def test_container_analysis_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -433,7 +433,7 @@ def test_container_analysis_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -464,7 +464,7 @@ def test_container_analysis_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -497,9 +497,8 @@ def test_container_analysis_client_client_options_from_dict():
         )
 
 
-def test_set_iam_policy(
-    transport: str = "grpc", request_type=iam_policy_pb2.SetIamPolicyRequest
-):
+@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,])
+def test_set_iam_policy(request_type, transport: str = "grpc"):
     client = ContainerAnalysisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -525,10 +524,6 @@ def test_set_iam_policy(
     assert response.etag == b"etag_blob"
 
 
-def test_set_iam_policy_from_dict():
-    test_set_iam_policy(request_type=dict)
-
-
 def test_set_iam_policy_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -716,9 +711,8 @@ async def test_set_iam_policy_flattened_error_async():
         )
 
 
-def test_get_iam_policy(
-    transport: str = "grpc", request_type=iam_policy_pb2.GetIamPolicyRequest
-):
+@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,])
+def test_get_iam_policy(request_type, transport: str = "grpc"):
     client = ContainerAnalysisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -744,10 +738,6 @@ def test_get_iam_policy(
     assert response.etag == b"etag_blob"
 
 
-def test_get_iam_policy_from_dict():
-    test_get_iam_policy(request_type=dict)
-
-
 def test_get_iam_policy_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -935,9 +925,10 @@ async def test_get_iam_policy_flattened_error_async():
         )
 
 
-def test_test_iam_permissions(
-    transport: str = "grpc", request_type=iam_policy_pb2.TestIamPermissionsRequest
-):
+@pytest.mark.parametrize(
+    "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,]
+)
+def test_test_iam_permissions(request_type, transport: str = "grpc"):
     client = ContainerAnalysisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -966,10 +957,6 @@ def test_test_iam_permissions(
     assert response.permissions == ["permissions_value"]
 
 
-def test_test_iam_permissions_from_dict():
-    test_test_iam_permissions(request_type=dict)
-
-
 def test_test_iam_permissions_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1191,10 +1178,10 @@ async def test_test_iam_permissions_flattened_error_async():
         )
 
 
-def test_get_vulnerability_occurrences_summary(
-    transport: str = "grpc",
-    request_type=containeranalysis.GetVulnerabilityOccurrencesSummaryRequest,
-):
+@pytest.mark.parametrize(
+    "request_type", [containeranalysis.GetVulnerabilityOccurrencesSummaryRequest, dict,]
+)
+def test_get_vulnerability_occurrences_summary(request_type, transport: str = "grpc"):
     client = ContainerAnalysisClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1220,10 +1207,6 @@ def test_get_vulnerability_occurrences_summary(
     assert isinstance(response, containeranalysis.VulnerabilityOccurrencesSummary)
 
 
-def test_get_vulnerability_occurrences_summary_from_dict():
-    test_get_vulnerability_occurrences_summary(request_type=dict)
-
-
 def test_get_vulnerability_occurrences_summary_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1918,7 +1901,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(