diff --git a/quesma/queryparser/pancake_sql_query_generation_test.go b/quesma/queryparser/pancake_sql_query_generation_test.go
index f0e02cd1e..9e9c1076d 100644
--- a/quesma/queryparser/pancake_sql_query_generation_test.go
+++ b/quesma/queryparser/pancake_sql_query_generation_test.go
@@ -63,9 +63,6 @@ func TestPancakeQueryGeneration(t *testing.T) {
 			if test.TestName == "multiple buckets_path(file:clients/clover,nr:1)" {
 				t.Skip("This needs fixing ASAP, easy to fix")
 			}
-			if test.TestName == "Clover(file:clients/clover,nr:6)" {
-				t.Skip("answers are fine, need to update test")
-			}
 
 			if test.TestName == "max_bucket. Reproduce: Visualize -> Line: Metrics: Max Bucket (Bucket: Filters, Metric: Sum)(file:opensearch-visualize/pipeline_agg_req,nr:20)" ||
 				test.TestName == "complex max_bucket. Reproduce: Visualize -> Line: Metrics: Max Bucket (Bucket: Filters, Metric: Sum), Buckets: Split chart: Rows -> Range(file:opensearch-visualize/pipeline_agg_req,nr:21)" {
diff --git a/quesma/testdata/clients/clover.go b/quesma/testdata/clients/clover.go
index 37864686f..8e44f9509 100644
--- a/quesma/testdata/clients/clover.go
+++ b/quesma/testdata/clients/clover.go
@@ -1007,41 +1007,69 @@ var CloverTests = []testdata.AggregationTestCase{
 					"total": 1
 				},
 				"aggregations": {
-					"sampler": {
-						"doc_count": 4675,
-						"eventRate": {
-							"buckets": [
-								{
-									"doc_count": 442,
-									"key": 1726351200000,
-									"key_as_string": "2024-09-14T22:00:00.000"
-								},
-								{
-									"doc_count": 0,
-									"key": 1726353000000,
-									"key_as_string": "2024-09-14T22:30:00.000"
-								},
-								{
-									"doc_count": 0,
-									"key": 1726354800000,
-									"key_as_string": "2024-09-14T23:00:00.000"
-								},
-								{
-									"doc_count": 0,
-									"key": 1726356600000,
-									"key_as_string": "2024-09-14T23:30:00.000"
-								},
-								{
-									"doc_count": 0,
-									"key": 1726356600000,
-									"key_as_string": "2024-09-15T00:00:00.000"
-								},
-								{
-									"doc_count": 1,
-									"key": 1728777600000,
-									"key_as_string": "2024-09-15T00:30:00.000"
+					"q": {
+						"meta": {
+							"type": "split"
+						},
+						"buckets": {
+							"!str_field:CRASH": {
+								"doc_count": 4675,
+								"time_buckets": {
+									"meta": {
+										"type": "time_buckets"
+									},
+									"buckets": [
+										{
+											"doc_count": 442,
+											"key": 1726351200000,
+											"key_as_string": "2024-09-14T22:00:00.000",
+											"sum(count)": {
+												"value": 442
+											}
+										},
+										{
+											"doc_count": 0,
+											"key": 1726353000000,
+											"key_as_string": "2024-09-14T22:30:00.000",
+											"sum(count)": {
+												"value": null
+											}
+										},
+										{
+											"doc_count": 0,
+											"key": 1726354800000,
+											"key_as_string": "2024-09-14T23:00:00.000",
+											"sum(count)": {
+												"value": null
+											}
+										},
+										{
+											"doc_count": 0,
+											"key": 1726356600000,
+											"key_as_string": "2024-09-14T23:30:00.000",
+											"sum(count)": {
+												"value": null
+											}
+										},
+										{
+											"doc_count": 0,
+											"key": 1726358400000,
+											"key_as_string": "2024-09-15T00:00:00.000",
+											"sum(count)": {
+												"value": null
+											}
+										},
+										{
+											"doc_count": 1,
+											"key": 1726360200000,
+											"key_as_string": "2024-09-15T00:30:00.000",
+											"sum(count)": {
+												"value": 1
+											}
+										}
+									]
 								}
-							]
+							}
 						}
 					}
 				},