diff --git a/WORKSPACE b/WORKSPACE
index b03c33df..3c6369f5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -61,8 +61,8 @@ rules_proto_toolchains()
 # section
 http_archive(
     name = "com_google_api_codegen",
-    strip_prefix = "gapic-generator-b7033a61dbfc7f1ad856b17299cf8aeb688a94f4",
-    urls = ["https://github.com/googleapis/gapic-generator/archive/b7033a61dbfc7f1ad856b17299cf8aeb688a94f4.zip"],
+    strip_prefix = "gapic-generator-cdfe1fc4bb43c0571cf3b780681108f215a76758",
+    urls = ["https://github.com/googleapis/gapic-generator/archive/cdfe1fc4bb43c0571cf3b780681108f215a76758.zip"],
 )
 
 ##############################################################################
@@ -135,8 +135,8 @@ load("@com_google_api_codegen//:repositories.bzl", "com_google_api_codegen_repos
 
 http_archive(
     name = "com_google_protoc_java_resource_names_plugin",
-    strip_prefix = "protoc-java-resource-names-plugin-2b04af0971699d6f042e8b5a6683487a40919a92",
-    urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/2b04af0971699d6f042e8b5a6683487a40919a92.zip"],
+    strip_prefix = "protoc-java-resource-names-plugin-a460b8c80dffe253de7f063358328730af4397fd",
+    urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/a460b8c80dffe253de7f063358328730af4397fd.zip"],
 )
 
 com_google_api_codegen_repositories()
diff --git a/google/cloud/asset/v1/BUILD.bazel b/google/cloud/asset/v1/BUILD.bazel
index 7ca0058e..f4759300 100644
--- a/google/cloud/asset/v1/BUILD.bazel
+++ b/google/cloud/asset/v1/BUILD.bazel
@@ -83,7 +83,7 @@ java_gapic_library(
 java_gapic_test(
     name = "asset_java_gapic_test_suite",
     test_classes = [
-        # "com.google.cloud.asset.v1.AssetServiceClientTest",
+        "com.google.cloud.asset.v1.AssetServiceClientTest",
     ],
     runtime_deps = [":asset_java_gapic_test"],
 )
diff --git a/google/cloud/asset/v1beta1/BUILD.bazel b/google/cloud/asset/v1beta1/BUILD.bazel
index 7f5a0d85..8a713d51 100644
--- a/google/cloud/asset/v1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1beta1/BUILD.bazel
@@ -81,7 +81,7 @@ java_gapic_library(
 java_gapic_test(
     name = "asset_java_gapic_test_suite",
     test_classes = [
-        # "com.google.cloud.asset.v1beta1.AssetServiceClientTest",
+        "com.google.cloud.asset.v1beta1.AssetServiceClientTest",
     ],
     runtime_deps = [":asset_java_gapic_test"],
 )
diff --git a/google/cloud/billing/budgets/v1beta1/BUILD.bazel b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
index 65840a6d..cb8cfa20 100644
--- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
@@ -74,8 +74,7 @@ java_gapic_library(
 java_gapic_test(
     name = "budgets_java_gapic_test_suite",
     test_classes = [
-        # Configure flattened methods in BudgetServiceClientTest
-        # "com.google.cloud.billing.budgets.v1beta1.BudgetServiceClientTest",
+        "com.google.cloud.billing.budgets.v1beta1.BudgetServiceClientTest",
     ],
     runtime_deps = [":budgets_java_gapic_test"],
 )
diff --git a/google/cloud/datacatalog/v1beta1/BUILD.bazel b/google/cloud/datacatalog/v1beta1/BUILD.bazel
index 18b0a2e5..d3349913 100644
--- a/google/cloud/datacatalog/v1beta1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel
@@ -87,10 +87,8 @@ java_gapic_test(
     name = "datacatalog_java_gapic_test_suite",
     test_classes = [
         "com.google.cloud.datacatalog.v1beta1.DataCatalogClientTest",
-        # PolicyTagManager and PolicyTagManagerSerialization services
-        #       are missing in gapic yaml. Add them.
-        # "com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClientTest",
-        # "com.google.cloud.datacatalog.v1beta1.PolicyTagManagerSerializationClientTest",
+        "com.google.cloud.datacatalog.v1beta1.PolicyTagManagerClientTest",
+        "com.google.cloud.datacatalog.v1beta1.PolicyTagManagerSerializationClientTest",
     ],
     runtime_deps = [":datacatalog_java_gapic_test"],
 )
diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel
index 6532fad1..35b3c8b2 100644
--- a/google/cloud/dataproc/v1/BUILD.bazel
+++ b/google/cloud/dataproc/v1/BUILD.bazel
@@ -81,7 +81,7 @@ java_gapic_test(
     name = "dataproc_java_gapic_test_suite",
     test_classes = [
         # Add AutoscalingPolicyService to gapic yaml
-        # "com.google.cloud.dataproc.v1.AutoscalingPolicyServiceClientTest",
+        "com.google.cloud.dataproc.v1.AutoscalingPolicyServiceClientTest",
         "com.google.cloud.dataproc.v1.ClusterControllerClientTest",
         "com.google.cloud.dataproc.v1.JobControllerClientTest",
         "com.google.cloud.dataproc.v1.WorkflowTemplateServiceClientTest",
diff --git a/google/cloud/talent/v4beta1/BUILD.bazel b/google/cloud/talent/v4beta1/BUILD.bazel
index 8f73538c..629e01f5 100644
--- a/google/cloud/talent/v4beta1/BUILD.bazel
+++ b/google/cloud/talent/v4beta1/BUILD.bazel
@@ -101,8 +101,7 @@ java_gapic_test(
     test_classes = [
         "com.google.cloud.talent.v4beta1.ApplicationServiceClientTest",
         "com.google.cloud.talent.v4beta1.CompanyServiceClientTest",
-        # Add flattening to CompletionClient service to enable tests
-        # "com.google.cloud.talent.v4beta1.CompletionClientTest",
+        "com.google.cloud.talent.v4beta1.CompletionClientTest",
         "com.google.cloud.talent.v4beta1.EventServiceClientTest",
         "com.google.cloud.talent.v4beta1.JobServiceClientTest",
         "com.google.cloud.talent.v4beta1.ProfileServiceClientTest",
diff --git a/google/cloud/tasks/v2beta2/BUILD.bazel b/google/cloud/tasks/v2beta2/BUILD.bazel
index 0e5e4047..7fd014e3 100644
--- a/google/cloud/tasks/v2beta2/BUILD.bazel
+++ b/google/cloud/tasks/v2beta2/BUILD.bazel
@@ -82,7 +82,7 @@ java_gapic_library(
 java_gapic_test(
     name = "tasks_java_gapic_test_suite",
     test_classes = [
-        # "com.google.cloud.tasks.v2beta2.CloudTasksClientTest",
+        "com.google.cloud.tasks.v2beta2.CloudTasksClientTest",
     ],
     runtime_deps = [":tasks_java_gapic_test"],
 )
diff --git a/google/monitoring/dashboard/v1/BUILD.bazel b/google/monitoring/dashboard/v1/BUILD.bazel
index 5d37a992..2816e99c 100644
--- a/google/monitoring/dashboard/v1/BUILD.bazel
+++ b/google/monitoring/dashboard/v1/BUILD.bazel
@@ -82,8 +82,7 @@ java_gapic_library(
 java_gapic_test(
     name = "dashboard_java_gapic_test_suite",
     test_classes = [
-        # Add flattening to DashboardsServiceClient service to enable tests
-        #"com.google.cloud.monitoring.dashboard.v1.DashboardsServiceClientTest",
+        "com.google.cloud.monitoring.dashboard.v1.DashboardsServiceClientTest",
     ],
     runtime_deps = [":dashboard_java_gapic_test"],
 )
diff --git a/google/privacy/dlp/v2/BUILD.bazel b/google/privacy/dlp/v2/BUILD.bazel
index b39a3cb6..a94220f8 100644
--- a/google/privacy/dlp/v2/BUILD.bazel
+++ b/google/privacy/dlp/v2/BUILD.bazel
@@ -79,7 +79,7 @@ java_gapic_library(
 java_gapic_test(
     name = "dlp_java_gapic_test_suite",
     test_classes = [
-        # "com.google.cloud.dlp.v2.DlpServiceClientTest",
+        "com.google.cloud.dlp.v2.DlpServiceClientTest",
     ],
     runtime_deps = [":dlp_java_gapic_test"],
 )