Fix grouping integ tests (#223)

Signed-off-by: David Zane <davizane@amazon.com>

Author: dzane17

src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperByNoneIT.java

@@ -22,10 +22,10 @@ public class MinMaxQueryGrouperByNoneIT extends QueryInsightsRestTestCase {
      */
     public void testGroupingByNone() throws IOException, InterruptedException {
 
-        waitForEmptyTopQueriesResponse();
-
         updateClusterSettings(this::groupByNoneSettings);
 
+        waitForEmptyTopQueriesResponse();
+
         // Search
         doSearch("range", 2);
         doSearch("match", 6);

src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperBySimilarityIT.java

@@ -25,10 +25,10 @@ public class MinMaxQueryGrouperBySimilarityIT extends QueryInsightsRestTestCase
      */
     public void testGroupingBySimilarity() throws IOException, InterruptedException {
 
-        waitForEmptyTopQueriesResponse();
-
         updateClusterSettings(this::defaultTopQueryGroupingSettings);
 
+        waitForEmptyTopQueriesResponse();
+
         // Search
         doSearch("range", 2);
         doSearch("match", 6);