diff --git a/tests/full/DieHardTest.php b/tests/full/DieHardTest.php
new file mode 100644
index 0000000..3b1635f
--- /dev/null
+++ b/tests/full/DieHardTest.php
@@ -0,0 +1,56 @@
+<?php
+class DieHardTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Birthday spacings: Choose random points on a large interval. 
+     * The spacings between the points should be asymptotically exponentially
+     * distributed.
+     */
+    public function testBirthday()
+    {
+        // Number of buckets to make
+        $num_buckets = 17;
+        $rand_min = 200000;
+        $rand_max = 600000;
+        $rand_step = 100000;
+        
+        for ($nums_to_generate = $rand_min; $nums_to_generate < $rand_max; $nums_to_generate += $rand_step) {
+            $buckets = array_fill(0, $num_buckets, 0);
+
+            // The number of ints we expect per bucket +/- 2%;
+            $min = (int) ceil(0.97 * $nums_to_generate / $num_buckets);
+            $max = (int) floor(1.03 * $nums_to_generate / $num_buckets);
+
+            for ($i = 0; $i < $nums_to_generate; ++$i) {
+                $random = random_int(0, 999);
+                $bucket = $random % $num_buckets;
+                $buckets[$bucket]++;
+            }
+            for ($i = 0; $i < $num_buckets; ++$i) {
+                
+                // Debugging code:
+                
+                if ($buckets[$i] <= $min ) {
+                    var_dump([
+                        'bucket' => $i,
+                        'value' => $buckets[$i], 
+                        'min' => $min, 
+                        'nums' => $nums_to_generate,
+                        'reason' => 'below min'
+                    ]);
+                }
+                if ($buckets[$i] >= $max ) {
+                    var_dump([
+                        'bucket' => $i,
+                        'value' => $buckets[$i],
+                        'maax' => $max,
+                        'nums' => $nums_to_generate,
+                        'reason' => 'above max'
+                    ]);
+                }
+                
+                $this->assertTrue($buckets[$i] < $max && $buckets[$i] > $min);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/full/DieHardTests.php b/tests/full/DieHardTests.php
deleted file mode 100644
index 0d32635..0000000
--- a/tests/full/DieHardTests.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-class DieHardTests extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Birthday spacings: Choose random points on a large interval. 
-     * The spacings between the points should be asymptotically exponentially
-     * distributed.
-     */
-    public function testBirthday()
-    {
-        $buckets = array_fill(0, 20, 0);
-        for ($i = 0; $i < 100000; ++$i) {
-            $random = random_int(0, 999);
-            $bucket = (int) floor($random / 100);
-            ++$buckets[$bucket];
-        }
-        for ($i = 0; $i < 10; ++$i) {
-            $this->assertTrue(
-                $buckets[$i] < 10500 
-                    &&
-                $buckets[$i] > 9500
-            );
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/full/StatTests.php b/tests/full/StatTest.php
similarity index 96%
rename from tests/full/StatTests.php
rename to tests/full/StatTest.php
index 1d46111..e78eb14 100644
--- a/tests/full/StatTests.php
+++ b/tests/full/StatTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class StatTests extends PHPUnit_Framework_TestCase
+class StatTest extends PHPUnit_Framework_TestCase
 {
     /**
      * All possible values should be > 30% but less than 170%