diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/AgentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/AgentsClientTest.java
index 41f363942..57c312122 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/AgentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/AgentsClientTest.java
@@ -49,9 +49,9 @@
 
 @Generated("by gapic-generator-java")
 public class AgentsClientTest {
+  private static MockAgents mockAgents;
   private static MockServiceHelper mockServiceHelper;
   private AgentsClient client;
-  private static MockAgents mockAgents;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/EnvironmentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/EnvironmentsClientTest.java
index c6c923e94..93bd62d61 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/EnvironmentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/EnvironmentsClientTest.java
@@ -52,9 +52,9 @@
 
 @Generated("by gapic-generator-java")
 public class EnvironmentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockServiceHelper mockServiceHelper;
   private EnvironmentsClient client;
-  private static MockEnvironments mockEnvironments;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/FlowsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/FlowsClientTest.java
index 3e055ab5a..dc9e3350d 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/FlowsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/FlowsClientTest.java
@@ -50,8 +50,8 @@
 
 @Generated("by gapic-generator-java")
 public class FlowsClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockFlows mockFlows;
+  private static MockServiceHelper mockServiceHelper;
   private FlowsClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/IntentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/IntentsClientTest.java
index b2cbc0af0..2bf878033 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/IntentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/IntentsClientTest.java
@@ -46,8 +46,8 @@
 
 @Generated("by gapic-generator-java")
 public class IntentsClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockIntents mockIntents;
+  private static MockServiceHelper mockServiceHelper;
   private IntentsClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SecuritySettingsServiceClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SecuritySettingsServiceClientTest.java
index 3313db0fc..a8215806f 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SecuritySettingsServiceClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SecuritySettingsServiceClientTest.java
@@ -45,9 +45,9 @@
 
 @Generated("by gapic-generator-java")
 public class SecuritySettingsServiceClientTest {
+  private static MockSecuritySettingsService mockSecuritySettingsService;
   private static MockServiceHelper mockServiceHelper;
   private SecuritySettingsServiceClient client;
-  private static MockSecuritySettingsService mockSecuritySettingsService;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SessionsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SessionsClientTest.java
index 4cadcf75b..e6eb78daa 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SessionsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/SessionsClientTest.java
@@ -46,10 +46,10 @@
 
 @Generated("by gapic-generator-java")
 public class SessionsClientTest {
+  private static MockSessions mockSessions;
   private static MockServiceHelper mockServiceHelper;
   private SessionsClient client;
   private LocalChannelProvider channelProvider;
-  private static MockSessions mockSessions;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/TestCasesClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/TestCasesClientTest.java
index bdcb3df16..26491a1c1 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/TestCasesClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3/TestCasesClientTest.java
@@ -51,9 +51,9 @@
 
 @Generated("by gapic-generator-java")
 public class TestCasesClientTest {
+  private static MockTestCases mockTestCases;
   private static MockServiceHelper mockServiceHelper;
   private TestCasesClient client;
-  private static MockTestCases mockTestCases;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/AgentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/AgentsClientTest.java
index 6337c665c..9c868f566 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/AgentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/AgentsClientTest.java
@@ -49,9 +49,9 @@
 
 @Generated("by gapic-generator-java")
 public class AgentsClientTest {
+  private static MockAgents mockAgents;
   private static MockServiceHelper mockServiceHelper;
   private AgentsClient client;
-  private static MockAgents mockAgents;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/EnvironmentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/EnvironmentsClientTest.java
index 5889663e9..73882c787 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/EnvironmentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/EnvironmentsClientTest.java
@@ -52,9 +52,9 @@
 
 @Generated("by gapic-generator-java")
 public class EnvironmentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockServiceHelper mockServiceHelper;
   private EnvironmentsClient client;
-  private static MockEnvironments mockEnvironments;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/FlowsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/FlowsClientTest.java
index 55bb66974..840cdd5ee 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/FlowsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/FlowsClientTest.java
@@ -50,8 +50,8 @@
 
 @Generated("by gapic-generator-java")
 public class FlowsClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockFlows mockFlows;
+  private static MockServiceHelper mockServiceHelper;
   private FlowsClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/IntentsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/IntentsClientTest.java
index 43d69830a..2aec8c414 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/IntentsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/IntentsClientTest.java
@@ -46,8 +46,8 @@
 
 @Generated("by gapic-generator-java")
 public class IntentsClientTest {
-  private static MockServiceHelper mockServiceHelper;
   private static MockIntents mockIntents;
+  private static MockServiceHelper mockServiceHelper;
   private IntentsClient client;
   private LocalChannelProvider channelProvider;
 
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SecuritySettingsServiceClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SecuritySettingsServiceClientTest.java
index 07b642e21..c9fa5122c 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SecuritySettingsServiceClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SecuritySettingsServiceClientTest.java
@@ -45,9 +45,9 @@
 
 @Generated("by gapic-generator-java")
 public class SecuritySettingsServiceClientTest {
+  private static MockSecuritySettingsService mockSecuritySettingsService;
   private static MockServiceHelper mockServiceHelper;
   private SecuritySettingsServiceClient client;
-  private static MockSecuritySettingsService mockSecuritySettingsService;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SessionsClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SessionsClientTest.java
index 45cfee730..6136f3121 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SessionsClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/SessionsClientTest.java
@@ -46,10 +46,10 @@
 
 @Generated("by gapic-generator-java")
 public class SessionsClientTest {
+  private static MockSessions mockSessions;
   private static MockServiceHelper mockServiceHelper;
   private SessionsClient client;
   private LocalChannelProvider channelProvider;
-  private static MockSessions mockSessions;
 
   @BeforeClass
   public static void startStaticServer() {
diff --git a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/TestCasesClientTest.java b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/TestCasesClientTest.java
index 6ae14c667..23491aed7 100644
--- a/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/TestCasesClientTest.java
+++ b/google-cloud-dialogflow-cx/src/test/java/com/google/cloud/dialogflow/cx/v3beta1/TestCasesClientTest.java
@@ -51,9 +51,9 @@
 
 @Generated("by gapic-generator-java")
 public class TestCasesClientTest {
+  private static MockTestCases mockTestCases;
   private static MockServiceHelper mockServiceHelper;
   private TestCasesClient client;
-  private static MockTestCases mockTestCases;
   private LocalChannelProvider channelProvider;
 
   @BeforeClass
diff --git a/synth.metadata b/synth.metadata
index 2ae9a60b6..0388319c1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,23 +4,23 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-dialogflow-cx.git",
-        "sha": "c7cd77f0e13ca6092448c632b29558d94e2d27b7"
+        "sha": "97f71abf7b6ffc6ea89dfdfdf1e7a7a0c79a0590"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "b2c4b3d62150a73507cbd3aa816fc0f177873556",
-        "internalRef": "375809988"
+        "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
+        "internalRef": "377081269"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "b2c4b3d62150a73507cbd3aa816fc0f177873556",
-        "internalRef": "375809988"
+        "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda",
+        "internalRef": "377081269"
       }
     },
     {