diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index eeee84fe..847fd47d 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -1022,12 +1022,20 @@ class Statistical
         // Loop through arguments
         $aArgs = Functions::flattenArrayIndexed($args);
         foreach ($aArgs as $k => $arg) {
+            // MS Excel does not count Booleans if passed as cell values, but they are counted if passed as literals
+            // OpenOffice Calc always counts Booleans
+            // Gnumeric never counts Booleans
             if ((is_bool($arg)) &&
-                ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
+                ((!Functions::isCellValue($k) && (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL)) ||
+                    (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE))) {
                 $arg = (int) $arg;
             }
             // Is it a numeric value?
-            if ((is_numeric($arg)) && (!is_string($arg))) {
+            // Strings containing numeric values are only counted if they are string literals (not cell values)
+            //    and then only in MS Excel and in Open Office, not in Gnumeric
+            if (((is_numeric($arg)) && (!is_string($arg))) ||
+                ((is_numeric($arg)) && (!Functions::isCellValue($k)) &&
+                    (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC))) {
                 ++$returnValue;
             }
         }
@@ -1054,10 +1062,10 @@ class Statistical
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray($args);
-        foreach ($aArgs as $arg) {
-            // Is it a numeric, boolean or string value?
-            if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
+        $aArgs = Functions::flattenArrayIndexed($args);
+        foreach ($aArgs as $k => $arg) {
+            // Nulls are counted if literals, but not if cell values
+            if ($arg !== null || (!Functions::isCellValue($k))) {
                 ++$returnValue;
             }
         }
@@ -1264,19 +1272,24 @@ class Statistical
         $alpha = Functions::flattenSingleValue($alpha);
 
         if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
+            $trials = (int) $trials;
+            $trialsApprox = $trials;
             if ($trials < 0) {
                 return Functions::NAN();
-            } elseif (($probability < 0) || ($probability > 1)) {
+            } elseif (($probability < 0.0) || ($probability > 1.0)) {
                 return Functions::NAN();
-            } elseif (($alpha < 0) || ($alpha > 1)) {
+            } elseif (($alpha < 0.0) || ($alpha > 1.0)) {
                 return Functions::NAN();
-            } elseif ($alpha <= 0.5) {
+            }
+
+            if ($alpha <= 0.5) {
                 $t = sqrt(log(1 / ($alpha * $alpha)));
                 $trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
             } else {
                 $t = sqrt(log(1 / pow(1 - $alpha, 2)));
                 $trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
             }
+
             $Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
             if ($Guess < 0) {
                 $Guess = 0;
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
index 0a2209e8..60e4a8ce 100644
--- a/src/PhpSpreadsheet/Style/Color.php
+++ b/src/PhpSpreadsheet/Style/Color.php
@@ -209,11 +209,8 @@ class Color extends Supervisor
     private static function getColourComponent($RGB, $offset, $hex = true)
     {
         $colour = substr($RGB, $offset, 2);
-        if (!$hex) {
-            $colour = hexdec($colour);
-        }
 
-        return $colour;
+        return ($hex) ? $colour : hexdec($colour);
     }
 
     /**
@@ -268,7 +265,7 @@ class Color extends Supervisor
      */
     public static function changeBrightness($hex, $adjustPercentage)
     {
-        $rgba = (strlen($hex) == 8);
+        $rgba = (strlen($hex) === 8);
 
         $red = self::getRed($hex, false);
         $green = self::getGreen($hex, false);
@@ -300,9 +297,9 @@ class Color extends Supervisor
         }
 
         $rgb = strtoupper(
-            str_pad(dechex($red), 2, '0', 0) .
-            str_pad(dechex($green), 2, '0', 0) .
-            str_pad(dechex($blue), 2, '0', 0)
+            str_pad(dechex((int) $red), 2, '0', 0) .
+            str_pad(dechex((int) $green), 2, '0', 0) .
+            str_pad(dechex((int) $blue), 2, '0', 0)
         );
 
         return (($rgba) ? 'FF' : '') . $rgb;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php
new file mode 100644
index 00000000..6babf483
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AveDevTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class AveDevTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerAVEDEV
+     *
+     * @param mixed $expectedResult
+     */
+    public function testAVEDEV($expectedResult, ...$args)
+    {
+        $result = Statistical::AVEDEV(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerAVEDEV()
+    {
+        return require 'data/Calculation/Statistical/AVEDEV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php
new file mode 100644
index 00000000..64fb7401
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageATest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class AverageATest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerAVERAGEA
+     *
+     * @param mixed $expectedResult
+     */
+    public function testAVERAGEA($expectedResult, ...$args)
+    {
+        $result = Statistical::AVERAGEA(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerAVERAGEA()
+    {
+        return require 'data/Calculation/Statistical/AVERAGEA.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php
new file mode 100644
index 00000000..cd2938ac
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageIfTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class AverageIfTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerAVERAGEIF
+     *
+     * @param mixed $expectedResult
+     */
+    public function testAVERAGEIF($expectedResult, ...$args)
+    {
+        $result = Statistical::AVERAGEIF(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerAVERAGEIF()
+    {
+        return require 'data/Calculation/Statistical/AVERAGEIF.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php
new file mode 100644
index 00000000..f7f75fc9
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/AverageTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class AverageTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerAVERAGE
+     *
+     * @param mixed $expectedResult
+     */
+    public function testAVERAGE($expectedResult, ...$args)
+    {
+        $result = Statistical::AVERAGE(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerAVERAGE()
+    {
+        return require 'data/Calculation/Statistical/AVERAGE.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php
new file mode 100644
index 00000000..cb84f75e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaDistTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class BetaDistTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerBETADIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testBETADIST($expectedResult, ...$args)
+    {
+        $result = Statistical::BETADIST(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerBETADIST()
+    {
+        return require 'data/Calculation/Statistical/BETADIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php
new file mode 100644
index 00000000..7dbc4bd7
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BetaInvTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class BetaInvTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerBETAINV
+     *
+     * @param mixed $expectedResult
+     */
+    public function testBETAINV($expectedResult, ...$args)
+    {
+        $result = Statistical::BETAINV(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerBETAINV()
+    {
+        return require 'data/Calculation/Statistical/BETAINV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php
new file mode 100644
index 00000000..3132c3ac
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/BinomDistTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class BinomDistTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerBINOMDIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testBINOMDIST($expectedResult, ...$args)
+    {
+        $result = Statistical::BINOMDIST(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerBINOMDIST()
+    {
+        return require 'data/Calculation/Statistical/BINOMDIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistTest.php
new file mode 100644
index 00000000..935ef71b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiDistTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class ChiDistTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCHIDIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCHIDIST($expectedResult, ...$args)
+    {
+        $result = Statistical::CHIDIST(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCHIDIST()
+    {
+        return require 'data/Calculation/Statistical/CHIDIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvTest.php
new file mode 100644
index 00000000..9980781e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ChiInvTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class ChiInvTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCHIINV
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCHIINV($expectedResult, ...$args)
+    {
+        $result = Statistical::CHIINV(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCHIINV()
+    {
+        return require 'data/Calculation/Statistical/CHIINV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php
new file mode 100644
index 00000000..b42cae4b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ConfidenceTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class ConfidenceTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCONFIDENCE
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCONFIDENCE($expectedResult, ...$args)
+    {
+        $result = Statistical::CONFIDENCE(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCONFIDENCE()
+    {
+        return require 'data/Calculation/Statistical/CONFIDENCE.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
new file mode 100644
index 00000000..9add74b4
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CorrelTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCORREL
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCORREL($expectedResult, array $xargs, array $yargs)
+    {
+        $result = Statistical::CORREL($xargs, $yargs);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCORREL()
+    {
+        return require 'data/Calculation/Statistical/CORREL.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php
new file mode 100644
index 00000000..623062ae
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountATest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CountATest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCOUNTA
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCOUNTA($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNTA(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCOUNTA()
+    {
+        return require 'data/Calculation/Statistical/COUNTA.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php
new file mode 100644
index 00000000..e58c8d19
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountBlankTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CountBlankTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCOUNTBLANK
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCOUNTBLANK($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNTBLANK(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCOUNTBLANK()
+    {
+        return require 'data/Calculation/Statistical/COUNTBLANK.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php
new file mode 100644
index 00000000..cad1765a
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CountIfTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCOUNTIF
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCOUNTIF($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNTIF(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCOUNTIF()
+    {
+        return require 'data/Calculation/Statistical/COUNTIF.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php
new file mode 100644
index 00000000..4f6e4776
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountIfsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CountIfsTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCOUNTIFS
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCOUNTIFS($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNTIFS(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCOUNTIFS()
+    {
+        return require 'data/Calculation/Statistical/COUNTIFS.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
new file mode 100644
index 00000000..065a0af1
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CountTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerBasicCOUNT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testBasicCOUNT($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNT(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerBasicCOUNT()
+    {
+        return require 'data/Calculation/Statistical/BasicCOUNT.php';
+    }
+
+    /**
+     * @dataProvider providerExcelCOUNT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testExcelCOUNT($expectedResult, ...$args)
+    {
+        $result = Statistical::COUNT(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerExcelCOUNT()
+    {
+        return require 'data/Calculation/Statistical/ExcelCOUNT.php';
+    }
+
+    /**
+     * @dataProvider providerOpenOfficeCOUNT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testOpenOfficeCOUNT($expectedResult, ...$args)
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_OPENOFFICE);
+
+        $result = Statistical::COUNT(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerOpenOfficeCOUNT()
+    {
+        return require 'data/Calculation/Statistical/OpenOfficeCOUNT.php';
+    }
+
+    /**
+     * @dataProvider providerGnumericCOUNT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testGnumericCOUNT($expectedResult, ...$args)
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_GNUMERIC);
+
+        $result = Statistical::COUNT(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerGnumericCOUNT()
+    {
+        return require 'data/Calculation/Statistical/GnumericCOUNT.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php
new file mode 100644
index 00000000..57d43d34
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CovarTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class CovarTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerCOVAR
+     *
+     * @param mixed $expectedResult
+     */
+    public function testCOVAR($expectedResult, ...$args)
+    {
+        $result = Statistical::COVAR(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerCOVAR()
+    {
+        return require 'data/Calculation/Statistical/COVAR.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php
new file mode 100644
index 00000000..2011285e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/ForecastTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class ForecastTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerFORECAST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testFORECAST($expectedResult, ...$args)
+    {
+        $result = Statistical::FORECAST(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerFORECAST()
+    {
+        return require 'data/Calculation/Statistical/FORECAST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php
new file mode 100644
index 00000000..f2cb233f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/InterceptTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class InterceptTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerINTERCEPT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testINTERCEPT($expectedResult, array $xargs, array $yargs)
+    {
+        $result = Statistical::INTERCEPT($xargs, $yargs);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerINTERCEPT()
+    {
+        return require 'data/Calculation/Statistical/INTERCEPT.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php
new file mode 100644
index 00000000..1000a09b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxIfsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MaxIfsTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerMAXIFS
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMAXIFS($expectedResult, ...$args)
+    {
+        $result = Statistical::MAXIFS(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerMAXIFS()
+    {
+        return require 'data/Calculation/Statistical/MAXIFS.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php
new file mode 100644
index 00000000..bbe21b00
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinIfsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MinIfsTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerMINIFS
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMINIFS($expectedResult, ...$args)
+    {
+        $result = Statistical::MINIFS(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerMINIFS()
+    {
+        return require 'data/Calculation/Statistical/MINIFS.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php
new file mode 100644
index 00000000..4f03d07f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/PermutTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class PermutTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerPERMUT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testPERMUT($expectedResult, ...$args)
+    {
+        $result = Statistical::PERMUT(...$args);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerPERMUT()
+    {
+        return require 'data/Calculation/Statistical/PERMUT.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php
new file mode 100644
index 00000000..7c540516
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/RsqTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class RsqTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerRSQ
+     *
+     * @param mixed $expectedResult
+     */
+    public function testRSQ($expectedResult, array $xargs, array $yargs)
+    {
+        $result = Statistical::RSQ($xargs, $yargs);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerRSQ()
+    {
+        return require 'data/Calculation/Statistical/RSQ.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php
new file mode 100644
index 00000000..a400ceae
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SlopeTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class SlopeTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerSLOPE
+     *
+     * @param mixed $expectedResult
+     */
+    public function testSLOPE($expectedResult, array $xargs, array $yargs)
+    {
+        $result = Statistical::SLOPE($xargs, $yargs);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerSLOPE()
+    {
+        return require 'data/Calculation/Statistical/SLOPE.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php
new file mode 100644
index 00000000..01d1b1bf
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SteyxTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class SteyxTest extends TestCase
+{
+    public function setUp()
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerSTEYX
+     *
+     * @param mixed $expectedResult
+     */
+    public function testSTEYX($expectedResult, array $xargs, array $yargs)
+    {
+        $result = Statistical::STEYX($xargs, $yargs);
+        self::assertEquals($expectedResult, $result, '', 1E-12);
+    }
+
+    public function providerSTEYX()
+    {
+        return require 'data/Calculation/Statistical/STEYX.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/StatisticalTest.php b/tests/PhpSpreadsheetTests/Calculation/StatisticalTest.php
deleted file mode 100644
index 92b52116..00000000
--- a/tests/PhpSpreadsheetTests/Calculation/StatisticalTest.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-namespace PhpOffice\PhpSpreadsheetTests\Calculation;
-
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
-use PHPUnit\Framework\TestCase;
-
-class StatisticalTest extends TestCase
-{
-    public function setUp()
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
-    /**
-     * @dataProvider providerAVEDEV
-     *
-     * @param mixed $expectedResult
-     */
-    public function testAVEDEV($expectedResult, ...$args)
-    {
-        $result = Statistical::AVEDEV(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerAVEDEV()
-    {
-        return require 'data/Calculation/Statistical/AVEDEV.php';
-    }
-
-    /**
-     * @dataProvider providerAVERAGE
-     *
-     * @param mixed $expectedResult
-     */
-    public function testAVERAGE($expectedResult, ...$args)
-    {
-        $result = Statistical::AVERAGE(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerAVERAGE()
-    {
-        return require 'data/Calculation/Statistical/AVERAGE.php';
-    }
-
-    /**
-     * @dataProvider providerAVERAGEA
-     *
-     * @param mixed $expectedResult
-     */
-    public function testAVERAGEA($expectedResult, ...$args)
-    {
-        $result = Statistical::AVERAGEA(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerAVERAGEA()
-    {
-        return require 'data/Calculation/Statistical/AVERAGEA.php';
-    }
-
-    /**
-     * @dataProvider providerAVERAGEIF
-     *
-     * @param mixed $expectedResult
-     */
-    public function testAVERAGEIF($expectedResult, ...$args)
-    {
-        $result = Statistical::AVERAGEIF(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerAVERAGEIF()
-    {
-        return require 'data/Calculation/Statistical/AVERAGEIF.php';
-    }
-
-    /**
-     * @dataProvider providerBETADIST
-     *
-     * @param mixed $expectedResult
-     */
-    public function testBETADIST($expectedResult, ...$args)
-    {
-        $result = Statistical::BETADIST(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerBETADIST()
-    {
-        return require 'data/Calculation/Statistical/BETADIST.php';
-    }
-
-    /**
-     * @dataProvider providerBETAINV
-     *
-     * @param mixed $expectedResult
-     */
-    public function testBETAINV($expectedResult, ...$args)
-    {
-        $result = Statistical::BETAINV(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerBETAINV()
-    {
-        return require 'data/Calculation/Statistical/BETAINV.php';
-    }
-
-    /**
-     * @dataProvider providerBINOMDIST
-     *
-     * @param mixed $expectedResult
-     */
-    public function testBINOMDIST($expectedResult, ...$args)
-    {
-        $result = Statistical::BINOMDIST(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerBINOMDIST()
-    {
-        return require 'data/Calculation/Statistical/BINOMDIST.php';
-    }
-
-    /**
-     * @dataProvider providerCHIDIST
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCHIDIST($expectedResult, ...$args)
-    {
-        $result = Statistical::CHIDIST(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCHIDIST()
-    {
-        return require 'data/Calculation/Statistical/CHIDIST.php';
-    }
-
-    /**
-     * @dataProvider providerCHIINV
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCHIINV($expectedResult, ...$args)
-    {
-        $result = Statistical::CHIINV(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCHIINV()
-    {
-        return require 'data/Calculation/Statistical/CHIINV.php';
-    }
-
-    /**
-     * @dataProvider providerCONFIDENCE
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCONFIDENCE($expectedResult, ...$args)
-    {
-        $result = Statistical::CONFIDENCE(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCONFIDENCE()
-    {
-        return require 'data/Calculation/Statistical/CONFIDENCE.php';
-    }
-
-    /**
-     * @dataProvider providerCORREL
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCORREL($expectedResult, array $xargs, array $yargs)
-    {
-        $result = Statistical::CORREL($xargs, $yargs);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCORREL()
-    {
-        return require 'data/Calculation/Statistical/CORREL.php';
-    }
-
-    /**
-     * @dataProvider providerCOUNTIF
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCOUNTIF($expectedResult, ...$args)
-    {
-        $result = Statistical::COUNTIF(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCOUNTIF()
-    {
-        return require 'data/Calculation/Statistical/COUNTIF.php';
-    }
-
-    /**
-     * @dataProvider providerCOUNTIFS
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCOUNTIFS($expectedResult, ...$args)
-    {
-        $result = Statistical::COUNTIFS(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCOUNTIFS()
-    {
-        return require 'data/Calculation/Statistical/COUNTIFS.php';
-    }
-
-    /**
-     * @dataProvider providerCOVAR
-     *
-     * @param mixed $expectedResult
-     */
-    public function testCOVAR($expectedResult, ...$args)
-    {
-        $result = Statistical::COVAR(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerCOVAR()
-    {
-        return require 'data/Calculation/Statistical/COVAR.php';
-    }
-
-    /**
-     * @dataProvider providerFORECAST
-     *
-     * @param mixed $expectedResult
-     */
-    public function testFORECAST($expectedResult, ...$args)
-    {
-        $result = Statistical::FORECAST(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerFORECAST()
-    {
-        return require 'data/Calculation/Statistical/FORECAST.php';
-    }
-
-    /**
-     * @dataProvider providerINTERCEPT
-     *
-     * @param mixed $expectedResult
-     */
-    public function testINTERCEPT($expectedResult, array $xargs, array $yargs)
-    {
-        $result = Statistical::INTERCEPT($xargs, $yargs);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerINTERCEPT()
-    {
-        return require 'data/Calculation/Statistical/INTERCEPT.php';
-    }
-
-    /**
-     * @dataProvider providerMAXIFS
-     *
-     * @param mixed $expectedResult
-     */
-    public function testMAXIFS($expectedResult, ...$args)
-    {
-        $result = Statistical::MAXIFS(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerMAXIFS()
-    {
-        return require 'data/Calculation/Statistical/MAXIFS.php';
-    }
-
-    /**
-     * @dataProvider providerMINIFS
-     *
-     * @param mixed $expectedResult
-     */
-    public function testMINIFS($expectedResult, ...$args)
-    {
-        $result = Statistical::MINIFS(...$args);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerMINIFS()
-    {
-        return require 'data/Calculation/Statistical/MINIFS.php';
-    }
-
-    /**
-     * @dataProvider providerRSQ
-     *
-     * @param mixed $expectedResult
-     */
-    public function testRSQ($expectedResult, array $xargs, array $yargs)
-    {
-        $result = Statistical::RSQ($xargs, $yargs);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerRSQ()
-    {
-        return require 'data/Calculation/Statistical/RSQ.php';
-    }
-
-    /**
-     * @dataProvider providerSLOPE
-     *
-     * @param mixed $expectedResult
-     */
-    public function testSLOPE($expectedResult, array $xargs, array $yargs)
-    {
-        $result = Statistical::SLOPE($xargs, $yargs);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerSLOPE()
-    {
-        return require 'data/Calculation/Statistical/SLOPE.php';
-    }
-
-    /**
-     * @dataProvider providerSTEYX
-     *
-     * @param mixed $expectedResult
-     */
-    public function testSTEYX($expectedResult, array $xargs, array $yargs)
-    {
-        $result = Statistical::STEYX($xargs, $yargs);
-        self::assertEquals($expectedResult, $result, '', 1E-12);
-    }
-
-    public function providerSTEYX()
-    {
-        return require 'data/Calculation/Statistical/STEYX.php';
-    }
-}
diff --git a/tests/data/Calculation/Statistical/BasicCOUNT.php b/tests/data/Calculation/Statistical/BasicCOUNT.php
new file mode 100644
index 00000000..8c0dc1c3
--- /dev/null
+++ b/tests/data/Calculation/Statistical/BasicCOUNT.php
@@ -0,0 +1,27 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+return [
+    [
+        5,
+        [-1, 0, 1, 2, 3],
+    ],
+    [
+        7,
+        [
+            Date::stringToExcel('1900-02-01'),
+            0,
+            null,
+            1.2,
+            '',
+            2.4,
+            '',
+            3.6,
+            '',
+            4.8,
+            'Not a numeric',
+            6
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/CONFIDENCE.php b/tests/data/Calculation/Statistical/CONFIDENCE.php
index 361b1360..484eef27 100644
--- a/tests/data/Calculation/Statistical/CONFIDENCE.php
+++ b/tests/data/Calculation/Statistical/CONFIDENCE.php
@@ -5,4 +5,12 @@ return [
         0.692951912734,
         0.05, 2.5, 50,
     ],
+    [
+        0.48999099653,
+        0.05, 2.5, 100,
+    ],
+    [
+        0.013719747903,
+        0.05, 0.07, 100,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/COUNTA.php b/tests/data/Calculation/Statistical/COUNTA.php
new file mode 100644
index 00000000..579af954
--- /dev/null
+++ b/tests/data/Calculation/Statistical/COUNTA.php
@@ -0,0 +1,51 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+
+return [
+    [
+        5,
+        [-1, 0, 1, 2, 3],
+    ],
+    [
+        11,
+        [
+            // The index simulates a cell value
+            '0.1.A' => Date::stringToExcel('1900-02-01'),
+            '0.2.A' => 0,
+            '0.3.A' => null,
+            '0.4.A' => 1.2,
+            '0.5.A' => '',
+            '0.6.A' => 2.4,
+            '0.7.A' => null,
+            '0.8.A' => '',
+            '0.9.A' => 3.6,
+            '0.10.A' => null,
+            '0.11.A' => '',
+            '0.12.A' => 4.8,
+            '0.13.A' => 'Not a numeric',
+            '0.14.A' => 6
+        ],
+    ],
+    [
+        14,
+        [
+            // No index indicates arguments passed as literals rather than cell values
+            // In this case, nuls are counted as well as numbers
+            Date::stringToExcel('1900-02-01'),
+            0,
+            null,
+            1.2,
+            '',
+            2.4,
+            null,
+            '',
+            3.6,
+            null,
+            '',
+            4.8,
+            'Not a numeric',
+            6
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/COUNTBLANK.php b/tests/data/Calculation/Statistical/COUNTBLANK.php
new file mode 100644
index 00000000..35b43167
--- /dev/null
+++ b/tests/data/Calculation/Statistical/COUNTBLANK.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    [
+        4,
+        [-1, null, 0, '', 1, null, 2, '', 3],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/CRITBINOM.php b/tests/data/Calculation/Statistical/CRITBINOM.php
new file mode 100644
index 00000000..8e59bf51
--- /dev/null
+++ b/tests/data/Calculation/Statistical/CRITBINOM.php
@@ -0,0 +1,24 @@
+<?php
+
+return [
+    [
+        4,
+        6, 0.5, 0.75,
+    ],
+    [
+        7,
+        12, 0.5, 0.75,
+    ],
+    [
+        46,
+        100, 0.5, 0.2,
+    ],
+    [
+        50,
+        100, 0.5, 0.5,
+    ],
+    [
+        56,
+        100, 0.5, 0.9,
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/ExcelCOUNT.php b/tests/data/Calculation/Statistical/ExcelCOUNT.php
new file mode 100644
index 00000000..6a01b3f3
--- /dev/null
+++ b/tests/data/Calculation/Statistical/ExcelCOUNT.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+    [
+        3,
+        [
+            // The index simulates a cell value
+            '0.1.A' => 'A',
+            '0.2.A' => 1,
+            '0.3.A' => true,
+            '0.4.A' => 2.9,
+            '0.5.A' => false,
+            '0.6.A' => '3',
+            '0.7.A' => '',
+            '0.8.A' => null,
+            '0.9.A' => 9,
+        ],
+    ],
+    [
+        6,
+        [
+            // No index indicates arguments passed as literals rather than cell values
+            // In this case, booleans are counted as well as numbers, as are numeric-value string literals
+            'A',
+            1,
+            true,
+            2.9,
+            false,
+            '3',
+            '',
+            null,
+            9,
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/GnumericCOUNT.php b/tests/data/Calculation/Statistical/GnumericCOUNT.php
new file mode 100644
index 00000000..1b496650
--- /dev/null
+++ b/tests/data/Calculation/Statistical/GnumericCOUNT.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    [
+        3,
+        [
+            // The index simulates a cell value
+            '0.1.A' => 'A',
+            '0.2.A' => 1,
+            '0.3.A' => true,
+            '0.4.A' => 2.9,
+            '0.5.A' => false,
+            '0.6.A' => '3',
+            '0.7.A' => '',
+            '0.8.A' => null,
+            '0.9.A' => 9,
+        ],
+    ],
+    [
+        3,
+        [
+            // No index indicates arguments passed as literals rather than cell values
+            'A',
+            1,
+            true,
+            2.9,
+            false,
+            '3',
+            '',
+            null,
+            9,
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/OpenOfficeCOUNT.php b/tests/data/Calculation/Statistical/OpenOfficeCOUNT.php
new file mode 100644
index 00000000..19026d31
--- /dev/null
+++ b/tests/data/Calculation/Statistical/OpenOfficeCOUNT.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    [
+        5,
+        [
+            // The index simulates a cell value
+            // Numbers and Booleans are both counted
+            '0.1.A' => 'A',
+            '0.2.A' => 1,
+            '0.3.A' => true,
+            '0.4.A' => 2.9,
+            '0.5.A' => false,
+            '0.6.A' => '3',
+            '0.7.A' => '',
+            '0.8.A' => null,
+            '0.9.A' => 9,
+        ],
+    ],
+    [
+        6,
+        [
+            // No index indicates arguments passed as literals rather than cell values
+            // In this case, booleans are counted as well as numbers, as are numeric-value string literals
+            'A',
+            1,
+            true,
+            2.9,
+            false,
+            '3',
+            '',
+            null,
+            9,
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/PERMUT.php b/tests/data/Calculation/Statistical/PERMUT.php
new file mode 100644
index 00000000..bcaa3e0c
--- /dev/null
+++ b/tests/data/Calculation/Statistical/PERMUT.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+    [
+        5,
+        5, 1,
+    ],
+    [
+        20,
+        5, 2,
+    ],
+    [
+        60,
+        5, 3,
+    ],
+    [
+        120,
+        5, 4,
+    ],
+    [
+        120,
+        5, 5,
+    ],
+    [
+        970200,
+        100, 3,
+    ],
+    [
+        6,
+        3, 2,
+    ],
+    [
+        720,
+        6, 6,
+    ],
+    [
+        5040,
+        7, 6,
+    ],
+    [
+        151200,
+        10, 6,
+    ],
+    [
+        10068347520,
+        49,6,
+    ],
+];