diff --git a/src/jenkins/ReleaseMetricsData.groovy b/src/jenkins/ReleaseMetricsData.groovy
index 39edff67..80b63741 100644
--- a/src/jenkins/ReleaseMetricsData.groovy
+++ b/src/jenkins/ReleaseMetricsData.groovy
@@ -10,7 +10,6 @@
 package jenkins
 
 import groovy.json.JsonOutput
-import groovyjarjarantlr.collections.List
 import utils.OpenSearchMetricsQuery
 
 class ReleaseMetricsData {
diff --git a/tests/jenkins/TestReleaseMetricsData.groovy b/tests/jenkins/TestReleaseMetricsData.groovy
index 9619a0ce..c2894780 100644
--- a/tests/jenkins/TestReleaseMetricsData.groovy
+++ b/tests/jenkins/TestReleaseMetricsData.groovy
@@ -78,21 +78,21 @@ class TestReleaseMetricsData {
                                 filter: [
                                         [
                                                 match_phrase: [
-                                                        component: "sql"
+                                                        version: "2.18.0"
                                                 ]
                                         ],
                                         [
                                                 match_phrase: [
-                                                        version: "2.18.0"
+                                                        "component": "sql"
                                                 ]
                                         ]
                                 ]
-                        ],
-                        sort: [
-                                [
-                                        current_date: [
-                                                order: "desc"
-                                        ]
+                        ]
+                ],
+                sort : [
+                        [
+                                current_date: [
+                                        order: "desc"
                                 ]
                         ]
                 ]