diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeQuery.java
index dc225320cf..fa95f47581 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeQuery.java
@@ -92,7 +92,7 @@ public XyShapeQuery.Builder toBuilder() {
     // ---------------------------------------------------------------------------------------------
 
     /**
-     * Builder for {@link ShapeQuery}.
+     * Builder for {@link XyShapeQuery}.
      */
 
     public static class Builder extends QueryBase.AbstractBuilder<XyShapeQuery.Builder> implements ObjectBuilder<XyShapeQuery> {
@@ -140,7 +140,7 @@ protected XyShapeQuery.Builder self() {
         }
 
         /**
-         * Builds a {@link ShapeQuery}.
+         * Builds a {@link XyShapeQuery}.
          *
          * @throws NullPointerException
          *             if some of the required fields are null.
@@ -155,7 +155,7 @@ public XyShapeQuery build() {
     // ---------------------------------------------------------------------------------------------
 
     /**
-     * Json deserializer for {@link ShapeQuery}
+     * Json deserializer for {@link XyShapeQuery}
      */
     public static final JsonpDeserializer<XyShapeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
         XyShapeQuery.Builder::new,
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQueryTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQueryTest.java
deleted file mode 100644
index 9d80ad39d6..0000000000
--- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQueryTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.opensearch.client.opensearch._types.query_dsl;
-
-import org.junit.Test;
-import org.opensearch.client.json.JsonData;
-import org.opensearch.client.opensearch.model.ModelTestCase;
-
-public class ShapeFieldQueryTest extends ModelTestCase {
-    @Test
-    public void toBuilder() {
-        ShapeFieldQuery origin = new ShapeFieldQuery.Builder().shape(JsonData.of("{}")).build();
-        ShapeFieldQuery copied = origin.toBuilder().build();
-
-        assertEquals(toJson(copied), toJson(origin));
-    }
-}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQueryTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQueryTest.java
deleted file mode 100644
index c6de52792d..0000000000
--- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQueryTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.opensearch.client.opensearch._types.query_dsl;
-
-import org.junit.Test;
-import org.opensearch.client.json.JsonData;
-import org.opensearch.client.opensearch.model.ModelTestCase;
-
-public class ShapeQueryTest extends ModelTestCase {
-    @Test
-    public void toBuilder() {
-        ShapeQuery origin = new ShapeQuery.Builder().field("field")
-            .shape(new ShapeFieldQuery.Builder().shape(JsonData.of("{}")).build())
-            .build();
-        ShapeQuery copied = origin.toBuilder().build();
-
-        assertEquals(toJson(copied), toJson(origin));
-    }
-}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
index 1566d26f05..c3e35373fa 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
@@ -37,7 +37,6 @@
 import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.opensearch._types.GeoLocation;
-import org.opensearch.client.opensearch._types.GeoShapeRelation;
 import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.opensearch._types.SortOptionsBuilders;
 import org.opensearch.client.opensearch._types.SortOrder;
@@ -59,22 +58,6 @@ public void testSingleKeyDictionary() {
         assertEquals("some-value", q.value().stringValue());
     }
 
-    @Test
-    public void testAdditionalPropertyOnClass() {
-        ShapeQuery q = new ShapeQuery.Builder().queryName("query-name")
-            .field("field-name")
-            .shape(_0 -> _0.relation(GeoShapeRelation.Disjoint))
-            .ignoreUnmapped(true)
-            .build();
-
-        q = checkJsonRoundtrip(q, "{\"field-name\":{\"relation\":\"disjoint\"},\"_name\":\"query-name\",\"ignore_unmapped\":true}");
-
-        assertEquals("query-name", q.queryName());
-        assertTrue(q.ignoreUnmapped());
-        assertEquals(GeoShapeRelation.Disjoint, q.shape().relation());
-        System.out.println(toJson(q));
-    }
-
     @Test
     public void testWrapperQuery() {
         WrapperQuery q = new WrapperQuery.Builder().query("encoded_query").build();