diff --git a/data/sqlite/random/expr/slt_good_103.slt b/data/sqlite/random/expr/slt_good_103.slt
index e28929b..83b1ee2 100644
--- a/data/sqlite/random/expr/slt_good_103.slt
+++ b/data/sqlite/random/expr/slt_good_103.slt
@@ -50557,12 +50557,10 @@ SELECT - 1 * + - 75 AS col2
 ----
 75
 
-# Postgresql - Postgres error: db error: ERROR: division by zero
-# Datafusion - Datafusion expected results:
-# Datafusion - Expected - NULL
-skipif postgres
-query error DataFusion error: Arrow error: Divide by zero error
+query I rowsort label-9617
 SELECT ALL CASE + MIN ( DISTINCT + - 81 ) WHEN - 81 THEN NULL WHEN SUM ( ALL + 93 ) + 23 THEN COUNT ( * ) WHEN COUNT ( * ) / ( 84 / - ( + 88 / 97 ) ) THEN 6 - 55 ELSE NULL END
+----
+NULL
 
 query I rowsort label-9618
 SELECT 25 + - - 53 + - + 35 + + - 30 / + 49 * CAST ( + 13 AS INTEGER )
diff --git a/data/sqlite/random/expr/slt_good_109.slt b/data/sqlite/random/expr/slt_good_109.slt
index 3a0a55a..12509b1 100644
--- a/data/sqlite/random/expr/slt_good_109.slt
+++ b/data/sqlite/random/expr/slt_good_109.slt
@@ -16141,12 +16141,10 @@ SELECT + - CAST ( NULL AS INTEGER ) * + 48 AS col0, + 40 * - 88
 NULL
 -3520
 
-# Postgresql - Postgres error: db error: ERROR: division by zero
-# Datafusion - Datafusion expected results:
-# Datafusion - Expected - 908
-skipif postgres
-query error DataFusion error: Arrow error: Divide by zero error
+query I rowsort label-3083
 SELECT DISTINCT - 11 * - + ( CASE CASE + 13 WHEN + 27 * 78 THEN - 91 + - 29 WHEN 60 THEN + 1 * 72 END WHEN 3 * - COUNT ( * ) THEN NULL WHEN 58 THEN NULL WHEN - 83 / - 0 THEN NULL ELSE 88 END ) * COUNT ( * ) - 60
+----
+908
 
 query I rowsort label-3084
 SELECT - CASE + 86 WHEN - 55 + - COUNT ( 3 ) * 98 THEN - 56 - - COUNT ( * ) * ( ( MIN ( ALL + 76 ) ) ) ELSE 1 END * - 93 AS col0
diff --git a/data/sqlite/random/expr/slt_good_53.slt b/data/sqlite/random/expr/slt_good_53.slt
index 23ac41a..5a43a07 100644
--- a/data/sqlite/random/expr/slt_good_53.slt
+++ b/data/sqlite/random/expr/slt_good_53.slt
@@ -46717,12 +46717,10 @@ SELECT - 93 - + - MIN ( DISTINCT + + CAST ( + 82 AS INTEGER ) ), + SUM ( ALL NUL
 -11
 -72
 
-# Postgresql - Postgres error: db error: ERROR: division by zero
-# Datafusion - Datafusion expected results:
-# Datafusion - Expected - -2162
-skipif postgres
-query error DataFusion error: Arrow error: Divide by zero error
+query I rowsort label-8893
 SELECT + CASE CAST ( NULL AS INTEGER ) WHEN + + 75 + - + SUM ( ALL - + 6 ) THEN NULL WHEN + 62 / + + 0 + + CASE - MAX ( + - 51 ) WHEN + - COUNT ( * ) + 7 + - 60 THEN NULL WHEN - CASE - 99 WHEN + + COUNT ( * ) THEN CASE - + NULLIF ( + NULLIF ( + 91, + 80 ), + - 81 * + 86 ) WHEN + 14 * + - COUNT ( * ) THEN - 87 + + 88 END - - 41 - - 51 - 95 + + 46 * 34 - - - 83 * COUNT ( * ) / - 93 WHEN 30 THEN 77 END / 35 THEN CAST ( NULL AS INTEGER ) END * - 26 THEN NULL ELSE 45 + COUNT ( * ) END * - 47 AS col2
+----
+-2162
 
 query II rowsort label-8894
 SELECT ALL 54, MAX ( DISTINCT - 28 ) AS col0
diff --git a/data/sqlite/random/expr/slt_good_77.slt b/data/sqlite/random/expr/slt_good_77.slt
index 7cc1282..5c055d8 100644
--- a/data/sqlite/random/expr/slt_good_77.slt
+++ b/data/sqlite/random/expr/slt_good_77.slt
@@ -40796,12 +40796,10 @@ SELECT DISTINCT 37 * + 86, 63 + + COUNT ( * ) AS col0
 3182
 64
 
-# Postgresql - Postgres error: db error: ERROR: division by zero
-# Datafusion - Datafusion expected results:
-# Datafusion - Expected - -16384
-skipif postgres
-query error DataFusion error: Arrow error: Divide by zero error
+query I rowsort label-7782
 SELECT ALL ( + 73 ) + - + 92 * - 97 + COALESCE ( + ( + NULLIF ( + 75, - MIN ( ALL + + 53 ) ) ), + ( - CASE - - 73 WHEN COALESCE ( - + 51, - 26 ) / + 0 THEN COUNT ( * ) * 14 END ), + COUNT ( * ) / + 3, + COUNT ( ALL 73 ) ) + - 86 * ( 8 ) * + 37 AS col1
+----
+-16384
 
 query I rowsort label-7783
 SELECT CAST ( NULL AS INTEGER ) + - 95 + + + 55 + - 11 AS col0