diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequest.java
index de13436746b16..3e16bcda325a8 100644
--- a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequest.java
+++ b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequest.java
@@ -14,9 +14,9 @@
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 
 import java.io.IOException;
 import java.util.Map;
@@ -94,7 +94,6 @@ public ChangeableQueryGroup getChangeableQueryGroup() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
         out.writeString(name);
         changeableQueryGroup.writeTo(out);
     }
diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceService.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceService.java
index a4fb666c324c8..29cafbc1e6fb8 100644
--- a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceService.java
+++ b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceService.java
@@ -29,13 +29,11 @@
 import org.opensearch.core.rest.RestStatus;
 import org.opensearch.plugin.wlm.action.CreateQueryGroupResponse;
 import org.opensearch.plugin.wlm.action.DeleteQueryGroupRequest;
-
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.plugin.wlm.action.UpdateQueryGroupRequest;
 import org.opensearch.plugin.wlm.action.UpdateQueryGroupResponse;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 import org.joda.time.Instant;
 
 import java.util.Collection;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/QueryGroupTestUtils.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/QueryGroupTestUtils.java
index 47a1fd9a94a22..2b1b07e357f08 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/QueryGroupTestUtils.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/QueryGroupTestUtils.java
@@ -20,9 +20,9 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.plugin.wlm.service.QueryGroupPersistenceService;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.wlm.ChangeableQueryGroup;
+import org.opensearch.wlm.ResourceType;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateQueryGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateQueryGroupResponseTests.java
index 713c62088b9ca..3a2ce215d21b5 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateQueryGroupResponseTests.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/CreateQueryGroupResponseTests.java
@@ -56,10 +56,10 @@ public void testToXContentCreateQueryGroup() throws IOException {
             + "  \"_id\" : \"AgfUO5Ja9yfsYlONlYi3TQ==\",\n"
             + "  \"name\" : \"query_group_one\",\n"
             + "  \"resiliency_mode\" : \"monitor\",\n"
-            + "  \"updated_at\" : 4513232413,\n"
             + "  \"resource_limits\" : {\n"
             + "    \"memory\" : 0.3\n"
-            + "  }\n"
+            + "  },\n"
+            + "  \"updated_at\" : 4513232413\n"
             + "}";
         assertEquals(expected, actual);
     }
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetQueryGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetQueryGroupResponseTests.java
index d9192dbb18fe4..1a2ac282d86a4 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetQueryGroupResponseTests.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/GetQueryGroupResponseTests.java
@@ -93,10 +93,10 @@ public void testToXContentGetSingleQueryGroup() throws IOException {
             + "      \"_id\" : \"AgfUO5Ja9yfsYlONlYi3TQ==\",\n"
             + "      \"name\" : \"query_group_one\",\n"
             + "      \"resiliency_mode\" : \"monitor\",\n"
-            + "      \"updated_at\" : 4513232413,\n"
             + "      \"resource_limits\" : {\n"
             + "        \"memory\" : 0.3\n"
-            + "      }\n"
+            + "      },\n"
+            + "      \"updated_at\" : 4513232413\n"
             + "    }\n"
             + "  ]\n"
             + "}";
@@ -119,19 +119,19 @@ public void testToXContentGetMultipleQueryGroup() throws IOException {
             + "      \"_id\" : \"AgfUO5Ja9yfsYlONlYi3TQ==\",\n"
             + "      \"name\" : \"query_group_one\",\n"
             + "      \"resiliency_mode\" : \"monitor\",\n"
-            + "      \"updated_at\" : 4513232413,\n"
             + "      \"resource_limits\" : {\n"
             + "        \"memory\" : 0.3\n"
-            + "      }\n"
+            + "      },\n"
+            + "      \"updated_at\" : 4513232413\n"
             + "    },\n"
             + "    {\n"
             + "      \"_id\" : \"G5iIqHy4g7eK1qIAAAAIH53=1\",\n"
             + "      \"name\" : \"query_group_two\",\n"
             + "      \"resiliency_mode\" : \"monitor\",\n"
-            + "      \"updated_at\" : 4513232415,\n"
             + "      \"resource_limits\" : {\n"
             + "        \"memory\" : 0.6\n"
-            + "      }\n"
+            + "      },\n"
+            + "      \"updated_at\" : 4513232415\n"
             + "    }\n"
             + "  ]\n"
             + "}";
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequestTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequestTests.java
index 147759bceebfa..2ffa515c12c02 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequestTests.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupRequestTests.java
@@ -10,10 +10,10 @@
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
-import org.opensearch.search.ResourceType;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupResponseTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupResponseTests.java
index 650e0bdc061ce..a7ab4c6a682ef 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupResponseTests.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/UpdateQueryGroupResponseTests.java
@@ -57,10 +57,10 @@ public void testToXContentUpdateSingleQueryGroup() throws IOException {
             + "  \"_id\" : \"AgfUO5Ja9yfsYlONlYi3TQ==\",\n"
             + "  \"name\" : \"query_group_one\",\n"
             + "  \"resiliency_mode\" : \"monitor\",\n"
-            + "  \"updated_at\" : 4513232413,\n"
             + "  \"resource_limits\" : {\n"
             + "    \"memory\" : 0.3\n"
-            + "  }\n"
+            + "  },\n"
+            + "  \"updated_at\" : 4513232413\n"
             + "}";
         assertEquals(expected, actual);
     }
diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceServiceTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceServiceTests.java
index b4426335c3169..aa3427ccbe307 100644
--- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceServiceTests.java
+++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/service/QueryGroupPersistenceServiceTests.java
@@ -26,11 +26,11 @@
 import org.opensearch.plugin.wlm.action.DeleteQueryGroupRequest;
 import org.opensearch.plugin.wlm.action.UpdateQueryGroupRequest;
 import org.opensearch.plugin.wlm.action.UpdateQueryGroupResponse;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java b/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java
index 11e8fa695d23d..b2755794108ff 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java
@@ -17,9 +17,9 @@
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 import org.joda.time.Instant;
 
 import java.io.IOException;
diff --git a/server/src/main/java/org/opensearch/wlm/ChangeableQueryGroup.java b/server/src/main/java/org/opensearch/wlm/ChangeableQueryGroup.java
index fad653d4fcbf9..b5268b74bf219 100644
--- a/server/src/main/java/org/opensearch/wlm/ChangeableQueryGroup.java
+++ b/server/src/main/java/org/opensearch/wlm/ChangeableQueryGroup.java
@@ -14,7 +14,7 @@
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.search.ResourceType;
+import org.opensearch.wlm.ResourceType;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupMetadataTests.java
index 63978a31cad59..8919852d63d31 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupMetadataTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupMetadataTests.java
@@ -15,8 +15,8 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractDiffableSerializationTestCase;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.wlm.ChangeableQueryGroup;
+import org.opensearch.wlm.ResourceType;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupTests.java b/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupTests.java
index 972f8ed80b6cc..fc33b36f6c34a 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/QueryGroupTests.java
@@ -15,9 +15,9 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractSerializingTestCase;
-import org.opensearch.wlm.ResourceType;
 import org.opensearch.wlm.ChangeableQueryGroup;
 import org.opensearch.wlm.ChangeableQueryGroup.ResiliencyMode;
+import org.opensearch.wlm.ResourceType;
 import org.joda.time.Instant;
 
 import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/wlm/ChangeableQueryGroupTests.java b/server/src/test/java/org/opensearch/wlm/ChangeableQueryGroupTests.java
index 77aaa3633ae96..74a697ddbc819 100644
--- a/server/src/test/java/org/opensearch/wlm/ChangeableQueryGroupTests.java
+++ b/server/src/test/java/org/opensearch/wlm/ChangeableQueryGroupTests.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.io.stream.StreamInput;
-import org.opensearch.search.ResourceType;
+import org.opensearch.wlm.ResourceType;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;