diff --git a/temporal-sdk/src/test/java/io/temporal/common/metadata/POJOWorkflowInterfaceMetadataTest.java b/temporal-sdk/src/test/java/io/temporal/common/metadata/POJOWorkflowInterfaceMetadataTest.java
index 59b2ea3e9..6dce87403 100644
--- a/temporal-sdk/src/test/java/io/temporal/common/metadata/POJOWorkflowInterfaceMetadataTest.java
+++ b/temporal-sdk/src/test/java/io/temporal/common/metadata/POJOWorkflowInterfaceMetadataTest.java
@@ -214,21 +214,21 @@ private Class<?> generateWorkflowInterfaceWithQueryMethod(
   @Test
   public void workflowInterfaceWithUpdateValidator() {
     POJOWorkflowInterfaceMetadata metadata =
-        POJOWorkflowInterfaceMetadata.newInstance(GUpdate.class);
+        POJOWorkflowInterfaceMetadata.newInstance(LUpdate.class);
   }
 
   @Test
   public void workflowInterfaceWithBadUpdateValidator() {
     assertThrows(
         IllegalArgumentException.class,
-        () -> POJOWorkflowInterfaceMetadata.newInstance(GUpdateBadValidator.class));
+        () -> POJOWorkflowInterfaceMetadata.newInstance(LUpdateBadValidator.class));
   }
 
   @Test
   public void workflowInterfaceValidatorWithNoUpdate() {
     assertThrows(
         IllegalArgumentException.class,
-        () -> POJOWorkflowInterfaceMetadata.newInstance(GUpdateValidatorWithNoUpdate.class));
+        () -> POJOWorkflowInterfaceMetadata.newInstance(LUpdateValidatorWithNoUpdate.class));
   }
 
   @Test
@@ -282,59 +282,65 @@ public interface F {
   }
 
   @WorkflowInterface
-  public interface G {
+  interface G {
     @WorkflowMethod
     void g();
   }
 
   @WorkflowInterface
-  public interface GUpdate extends G {
-    @UpdateMethod
-    void update(Map<String, Integer> input);
-
-    @UpdateValidatorMethod(updateName = "update")
-    void validate(Map<String, Integer> input);
+  public interface H {
+    @WorkflowMethod
+    void h(Integer i);
   }
 
   @WorkflowInterface
-  public interface GUpdateBadValidator extends G {
-    @UpdateMethod
-    void update(Map<String, Integer> input);
+  public interface I {
+    @WorkflowMethod
+    void i();
+  }
 
+  public interface J {
     @UpdateValidatorMethod(updateName = "update")
-    void validate(Map<String, String> input);
+    void validate(String input);
   }
 
   @WorkflowInterface
-  public interface GUpdateValidatorWithNoUpdate extends G {
-    @UpdateMethod
-    void update(Map<String, Integer> input);
-
-    @UpdateValidatorMethod(updateName = "wrongUpdate")
-    void validate(Map<String, Integer> input);
+  public interface K {
+    @WorkflowMethod
+    void f(Map<String, EncodedValuesTest.Pair> input);
   }
 
   @WorkflowInterface
-  public interface H {
+  public interface L {
     @WorkflowMethod
-    void h(Integer i);
+    void l();
   }
 
   @WorkflowInterface
-  public interface I {
-    @WorkflowMethod
-    void i();
+  public interface LUpdate extends L {
+    @UpdateMethod
+    void update(Map<String, Integer> input);
+
+    @UpdateValidatorMethod(updateName = "update")
+    void validate(Map<String, Integer> input);
   }
 
-  public interface J {
+  @WorkflowInterface
+  public interface LUpdateBadValidator extends L {
+    @UpdateMethod
+    void update(Map<String, Integer> input);
+
     @UpdateValidatorMethod(updateName = "update")
-    void validate(String input);
+    void validate(Map<String, String> input);
   }
 
   @WorkflowInterface
-  public interface K {
-    @WorkflowMethod
-    void f(Map<String, EncodedValuesTest.Pair> input);
+  public interface LUpdateValidatorWithNoUpdate extends L {
+    @UpdateMethod
+    void update(Map<String, Integer> input);
+
+    @UpdateValidatorMethod(updateName = "wrongUpdate")
+    void validate(Map<String, Integer> input);
   }
 
   public interface DE extends D, E {}