diff --git a/test/CDB_EqualIntervalBinsTest.sql b/test/CDB_EqualIntervalBinsTest.sql
index 1b8426a..eebd51e 100644
--- a/test/CDB_EqualIntervalBinsTest.sql
+++ b/test/CDB_EqualIntervalBinsTest.sql
@@ -2,4 +2,10 @@ WITH data AS (
     SELECT array_agg(x::numeric) s FROM generate_series(1,300) x 
         WHERE x % 5 != 0 AND x % 7 != 0
     ) 
-SELECT round(unnest(CDB_EqualIntervalBins(s, 7)),7) FROM data
\ No newline at end of file
+SELECT round(unnest(CDB_EqualIntervalBins(s, 7)),7) FROM data;
+
+WITH data_nulls AS (
+    SELECT array_agg(CASE WHEN x % 2 != 0 THEN x ELSE NULL END::numeric) s FROM generate_series(1,100) x
+        WHERE x % 5 != 0 AND x % 7 != 0
+    )
+SELECT round(unnest(CDB_EqualIntervalBins(s, 7)),7) FROM data_nulls;
diff --git a/test/CDB_EqualIntervalBinsTest_expect b/test/CDB_EqualIntervalBinsTest_expect
index df45bc4..9b724fa 100644
--- a/test/CDB_EqualIntervalBinsTest_expect
+++ b/test/CDB_EqualIntervalBinsTest_expect
@@ -5,3 +5,10 @@
 213.8571429
 256.4285714
 299.0000000
+15.0000000
+29.0000000
+43.0000000
+57.0000000
+71.0000000
+85.0000000
+99.0000000
diff --git a/test/CDB_HeadsTailsBinsTest.sql b/test/CDB_HeadsTailsBinsTest.sql
index f7b19da..1c71f7e 100644
--- a/test/CDB_HeadsTailsBinsTest.sql
+++ b/test/CDB_HeadsTailsBinsTest.sql
@@ -1,5 +1,11 @@
 WITH data AS (
-    SELECT array_agg(x) x FROM generate_series(1,100) x 
+    SELECT array_agg(x::numeric) s FROM generate_series(1,100) x
         WHERE x % 5 != 0 AND x % 7 != 0
-    ) 
-SELECT round(unnest(CDB_HeadsTailsBins(x, 7)),2) FROM data
\ No newline at end of file
+    )
+SELECT round(unnest(CDB_HeadsTailsBins(s, 7)),2) FROM data;
+
+WITH data_nulls AS (
+    SELECT array_agg(CASE WHEN x % 2 != 0 THEN x ELSE NULL END::numeric) s FROM generate_series(1,100) x
+        WHERE x % 5 != 0 AND x % 7 != 0
+    )
+SELECT round(unnest(CDB_HeadsTailsBins(s, 7)),2) FROM data_nulls;
diff --git a/test/CDB_HeadsTailsBinsTest_expect b/test/CDB_HeadsTailsBinsTest_expect
index ab6f52b..4c204d0 100644
--- a/test/CDB_HeadsTailsBinsTest_expect
+++ b/test/CDB_HeadsTailsBinsTest_expect
@@ -5,3 +5,9 @@
 96.50
 98.00
 99.00
+49.76
+74.65
+88.50
+94.50
+98.00
+99.00
diff --git a/test/CDB_JenksBinsTest.sql b/test/CDB_JenksBinsTest.sql
index d45c973..b8bfbaa 100644
--- a/test/CDB_JenksBinsTest.sql
+++ b/test/CDB_JenksBinsTest.sql
@@ -1,5 +1,11 @@
 WITH data AS (
-    SELECT array_agg(x) x FROM generate_series(1,100) x 
+    SELECT array_agg(x::numeric) s FROM generate_series(1,300) x
         WHERE x % 5 != 0 AND x % 7 != 0
     ) 
-SELECT unnest(CDB_JenksBins(x, 7)) FROM data
\ No newline at end of file
+SELECT unnest(CDB_JenksBins(s, 7)) FROM data;
+
+WITH data_nulls AS (
+    SELECT array_agg(CASE WHEN x % 2 != 0 THEN x ELSE NULL END::numeric) s FROM generate_series(1,300) x
+        WHERE x % 5 != 0 AND x % 7 != 0
+    )
+SELECT unnest(CDB_JenksBins(s, 7)) FROM data_nulls;
diff --git a/test/CDB_JenksBinsTest_expect b/test/CDB_JenksBinsTest_expect
index 825efba..496e6be 100644
--- a/test/CDB_JenksBinsTest_expect
+++ b/test/CDB_JenksBinsTest_expect
@@ -1,7 +1,14 @@
-13
-29
 43
-57
-71
-83
-99
+86
+129
+172
+213
+257
+299
+37
+51
+97
+157
+213
+241
+
diff --git a/test/CDB_QuantileBinsTest.sql b/test/CDB_QuantileBinsTest.sql
index 35d827f..4a02a0c 100644
--- a/test/CDB_QuantileBinsTest.sql
+++ b/test/CDB_QuantileBinsTest.sql
@@ -1,5 +1,11 @@
 WITH data AS (
-    SELECT array_agg(x) x FROM generate_series(1,100) x 
+    SELECT array_agg(x::numeric) s FROM generate_series(1,100) x
         WHERE x % 5 != 0 AND x % 7 != 0
     ) 
-SELECT unnest(CDB_QuantileBins(x, 7)) FROM data
\ No newline at end of file
+SELECT unnest(CDB_QuantileBins(s, 7)) FROM data;
+
+WITH data_nulls AS (
+    SELECT array_agg(CASE WHEN x % 2 != 0 THEN x ELSE NULL END::numeric) s FROM generate_series(1,100) x
+        WHERE x % 5 != 0 AND x % 7 != 0
+    )
+SELECT unnest(CDB_QuantileBins(s, 7)) FROM data_nulls;
diff --git a/test/CDB_QuantileBinsTest_expect b/test/CDB_QuantileBinsTest_expect
index 46c2997..9261ae3 100644
--- a/test/CDB_QuantileBinsTest_expect
+++ b/test/CDB_QuantileBinsTest_expect
@@ -4,4 +4,11 @@
 57
 71
 86
+99
+29
+57
+87
+
+
+
 99