diff --git a/.gitattributes b/.gitattributes
index 58182f25..8afa9920 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 /Build export-ignore
-/unitTests export-ignore
+/tests export-ignore
 README.md export-ignore
diff --git a/.gitignore b/.gitignore
index dea03b5e..c3b65f07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 build/PHPExcel.phar
-unitTests/codeCoverage
+tests/codeCoverage
 analysis
 
 ## IDE support
diff --git a/.travis.yml b/.travis.yml
index 68dcb08c..bcc21aad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,6 @@ before_script:
 
 script:
   ## PHP_CodeSniffer
-  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full src/ unitTests/ --standard=PSR2 -n
+  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full src/ tests/ --standard=PSR2 -n
   ## PHPUnit
-  - ./vendor/bin/phpunit -c ./unitTests/
+  - ./vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 243c1e38..4305ae99 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "phpoffice/phpspreadsheet",
     "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-    "keywords": ["PHP","OpenXML","Excel","xlsx","xls","ods","gnumeric","spreadsheet"],
+    "keywords": ["PHP", "OpenXML", "Excel", "xlsx", "xls", "ods", "gnumeric", "spreadsheet"],
     "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
     "type": "library",
     "license": "LGPL-2.1",
@@ -45,5 +45,10 @@
         "psr-4": {
             "PHPExcel\\": "src/PhpSpreadsheet"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpSpreadsheet\\Tests\\": "tests/PhpSpreadsheet"
+        }
     }
 }
diff --git a/phpunit-cc.xml b/phpunit-cc.xml
new file mode 100644
index 00000000..c7c314f8
--- /dev/null
+++ b/phpunit-cc.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/bootstrap.php"
+    backupGlobals="true"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    syntaxCheck="true"
+    verbose="true"
+    reportUselessTests="true"
+    strictCoverage="true"
+    disallowTestOutput="true"
+    stopOnError="false"
+    stopOnFailure="false"
+    stopOnIncomplete="false"
+    stopOnSkipped="false">
+    <php>
+        <ini name="memory_limit" value="2048M"/>
+    </php>
+    <testsuite name="PHPExcel Unit Test Suite">
+        <directory suffix="Test.php">./tests/PhpSpreadsheet</directory>
+    </testsuite>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src</directory>
+            <exclude>
+                <directory>./src/PhpSpreadsheet/Shared/PCLZip</directory>
+                <directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
+                <directory>./src/PhpSpreadsheet/Writer/PDF</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-html" target="./tests/codeCoverage" charset="UTF-8"
+             yui="true" highlight="false"
+             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="./tests/codeCoverage/codeCoverage.xml"/>
+        <log type="metrics-xml" target="./tests/metrics/metrics.xml"/>
+        <log type="test-xml" target="./tests/testResults/logfile.xml" logIncompleteSkipped="false"/>
+    </logging>
+</phpunit>
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..52f6ec5f
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/bootstrap.php"
+    backupGlobals="true"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    syntaxCheck="true"
+    verbose="true"
+    reportUselessTests="true"
+    strictCoverage="true"
+    disallowTestOutput="true"
+    stopOnError="false"
+    stopOnFailure="false"
+    stopOnIncomplete="false"
+    stopOnSkipped="false">
+    <php>
+        <ini name="memory_limit" value="2048M"/>
+    </php>
+    <testsuite name="PHPExcel Unit Test Suite">
+        <directory suffix="Test.php">./tests/PhpSpreadsheet</directory>
+    </testsuite>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src</directory>
+            <exclude>
+                <directory>./src/PhpSpreadsheet/Shared/PCLZip</directory>
+                <directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
+                <directory>./src/PhpSpreadsheet/Writer/PDF</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/unitTests/Classes/src/Calculation/DateTimeTest.php b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php
similarity index 98%
rename from unitTests/Classes/src/Calculation/DateTimeTest.php
rename to tests/PhpSpreadsheet/Calculation/DateTimeTest.php
index 316f8b3d..9300c604 100644
--- a/unitTests/Classes/src/Calculation/DateTimeTest.php
+++ b/tests/PhpSpreadsheet/Calculation/DateTimeTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace PHPExcel\Calculation;
+namespace PhpSpreadsheet\Tests\Calculation;
 
-use PhpSpreadhsheet\unitTests\TestDataFileIterator;
+use PhpSpreadsheet\Tests\TestDataFileIterator;
 use PHPExcel\Shared\Date;
+use PHPExcel\Calculation\Functions;
+use PHPExcel\Calculation\DateTime;
 
 /**
  * Class DateTimeTest
diff --git a/unitTests/Classes/src/Calculation/EngineeringTest.php b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php
similarity index 77%
rename from unitTests/Classes/src/Calculation/EngineeringTest.php
rename to tests/PhpSpreadsheet/Calculation/EngineeringTest.php
index 204cca2f..5a58ed20 100644
--- a/unitTests/Classes/src/Calculation/EngineeringTest.php
+++ b/tests/PhpSpreadsheet/Calculation/EngineeringTest.php
@@ -1,25 +1,18 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-//  Custom assertion class for handling precision of Complex numbers
-require_once 'custom/complexAssert.php';
-
-//  Data Provider handler
-require_once 'testDataFileIterator.php';
-
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class EngineeringTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \PhpSpreadhsheet\unitTests\custom\ComplexAssert
+     * @var \PhpSpreadsheet\Tests\Custom\ComplexAssert
      */
     protected $complexAssert;
 
     public function setUp()
     {
-        $this->complexAssert = new \PhpSpreadhsheet\unitTests\custom\ComplexAssert();
+        $this->complexAssert = new \PhpSpreadsheet\Tests\Custom\ComplexAssert();
         \PHPExcel\Calculation\Functions::setCompatibilityMode(\PHPExcel\Calculation\Functions::COMPATIBILITY_EXCEL);
     }
 
@@ -41,7 +34,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBESSELI()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
     }
 
     /**
@@ -57,7 +50,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBESSELJ()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
     }
 
     /**
@@ -73,7 +66,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBESSELK()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
     }
 
     /**
@@ -89,7 +82,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBESSELY()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
     }
 
     /**
@@ -105,7 +98,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOMPLEX()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
     }
 
     /**
@@ -121,7 +114,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMAGINARY()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
     }
 
     /**
@@ -137,7 +130,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMREAL()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
     }
 
     /**
@@ -153,7 +146,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMABS()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
     }
 
     /**
@@ -170,7 +163,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMARGUMENT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
     }
 
     /**
@@ -186,7 +179,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMCONJUGATE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
     }
 
     /**
@@ -202,7 +195,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMCOS()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
     }
 
     /**
@@ -219,7 +212,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMDIV()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
     }
 
     /**
@@ -235,7 +228,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMEXP()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
     }
 
     /**
@@ -251,7 +244,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMLN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
     }
 
     /**
@@ -267,7 +260,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMLOG2()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
     }
 
     /**
@@ -283,7 +276,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMLOG10()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
     }
 
     /**
@@ -300,7 +293,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMPOWER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
     }
 
     /**
@@ -316,7 +309,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMPRODUCT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
     }
 
     /**
@@ -332,7 +325,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMSIN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
     }
 
     /**
@@ -348,7 +341,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMSQRT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
     }
 
     /**
@@ -365,7 +358,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMSUB()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
     }
 
     /**
@@ -382,7 +375,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerIMSUM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
     }
 
     /**
@@ -398,7 +391,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerERF()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
     }
 
     /**
@@ -414,7 +407,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerERFC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
     }
 
     /**
@@ -430,7 +423,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBIN2DEC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
     }
 
     /**
@@ -446,7 +439,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBIN2HEX()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
     }
 
     /**
@@ -462,7 +455,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerBIN2OCT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
     }
 
     /**
@@ -478,7 +471,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerDEC2BIN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
     }
 
     /**
@@ -494,7 +487,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerDEC2HEX()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
     }
 
     /**
@@ -510,7 +503,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerDEC2OCT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
     }
 
     /**
@@ -526,7 +519,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerHEX2BIN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
     }
 
     /**
@@ -542,7 +535,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerHEX2DEC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
     }
 
     /**
@@ -558,7 +551,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerHEX2OCT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
     }
 
     /**
@@ -574,7 +567,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerOCT2BIN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
     }
 
     /**
@@ -590,7 +583,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerOCT2DEC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
     }
 
     /**
@@ -606,7 +599,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerOCT2HEX()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
     }
 
     /**
@@ -622,7 +615,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerDELTA()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
     }
 
     /**
@@ -638,7 +631,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerGESTEP()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
     }
 
     public function testGetConversionGroups()
@@ -678,6 +671,6 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     public function providerCONVERTUOM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/FinancialTest.php b/tests/PhpSpreadsheet/Calculation/FinancialTest.php
similarity index 77%
rename from unitTests/Classes/src/Calculation/FinancialTest.php
rename to tests/PhpSpreadsheet/Calculation/FinancialTest.php
index 12cc3e8f..76dfb6d3 100644
--- a/unitTests/Classes/src/Calculation/FinancialTest.php
+++ b/tests/PhpSpreadsheet/Calculation/FinancialTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class FinancialTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,7 +24,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerACCRINT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
     }
 
     /**
@@ -42,7 +40,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerACCRINTM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
     }
 
     /**
@@ -58,7 +56,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerAMORDEGRC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
     }
 
     /**
@@ -74,7 +72,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerAMORLINC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
     }
 
     /**
@@ -90,7 +88,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYBS()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
     }
 
     /**
@@ -106,7 +104,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYS()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
     }
 
     /**
@@ -122,7 +120,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYSNC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
     }
 
     /**
@@ -138,7 +136,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPNCD()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
     }
 
     /**
@@ -154,7 +152,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPNUM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
     }
 
     /**
@@ -170,7 +168,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOUPPCD()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
     }
 
     /**
@@ -186,7 +184,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCUMIPMT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
     }
 
     /**
@@ -202,7 +200,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerCUMPRINC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
     }
 
     /**
@@ -218,7 +216,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerDB()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data');
     }
 
     /**
@@ -234,7 +232,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerDDB()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
     }
 
     /**
@@ -250,7 +248,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerDISC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
     }
 
     /**
@@ -266,7 +264,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerDOLLARDE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
     }
 
     /**
@@ -282,7 +280,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerDOLLARFR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
     }
 
     /**
@@ -298,7 +296,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerEFFECT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
     }
 
     /**
@@ -314,7 +312,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerFV()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data');
     }
 
     /**
@@ -330,7 +328,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerFVSCHEDULE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
     }
 
     /**
@@ -346,7 +344,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerINTRATE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
     }
 
     /**
@@ -362,7 +360,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerIPMT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
     }
 
     /**
@@ -378,7 +376,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerIRR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
     }
 
     /**
@@ -394,7 +392,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerISPMT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
     }
 
     /**
@@ -410,7 +408,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerMIRR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
     }
 
     /**
@@ -426,7 +424,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerNOMINAL()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
     }
 
     /**
@@ -442,7 +440,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerNPER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
     }
 
     /**
@@ -458,7 +456,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerNPV()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
     }
 
     /**
@@ -475,7 +473,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerPRICE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
     }
 
     /**
@@ -492,7 +490,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerRATE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
     }
 
     /**
@@ -509,6 +507,6 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     public function providerXIRR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/FunctionsTest.php b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php
similarity index 80%
rename from unitTests/Classes/src/Calculation/FunctionsTest.php
rename to tests/PhpSpreadsheet/Calculation/FunctionsTest.php
index 76050456..af391dd9 100644
--- a/unitTests/Classes/src/Calculation/FunctionsTest.php
+++ b/tests/PhpSpreadsheet/Calculation/FunctionsTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class FunctionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -73,7 +71,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsBlank()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
     }
 
     /**
@@ -89,7 +87,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsErr()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
     }
 
     /**
@@ -105,7 +103,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsError()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
     }
 
     /**
@@ -121,7 +119,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerErrorType()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
     }
 
     /**
@@ -137,7 +135,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsLogical()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
     }
 
     /**
@@ -153,7 +151,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsNa()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
     }
 
     /**
@@ -169,7 +167,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsNumber()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
     }
 
     /**
@@ -185,7 +183,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsText()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
     }
 
     /**
@@ -201,7 +199,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsNonText()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
     }
 
     /**
@@ -217,7 +215,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsEven()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
     }
 
     /**
@@ -233,7 +231,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsOdd()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
     }
 
     /**
@@ -249,7 +247,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerTYPE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
     }
 
     /**
@@ -265,6 +263,6 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     public function providerN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/LogicalTest.php b/tests/PhpSpreadsheet/Calculation/LogicalTest.php
similarity index 78%
rename from unitTests/Classes/src/Calculation/LogicalTest.php
rename to tests/PhpSpreadsheet/Calculation/LogicalTest.php
index 4cd533e3..8d01df06 100644
--- a/unitTests/Classes/src/Calculation/LogicalTest.php
+++ b/tests/PhpSpreadsheet/Calculation/LogicalTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class LogicalTest extends \PHPUnit_Framework_TestCase
 {
@@ -37,7 +35,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     public function providerAND()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data');
     }
 
     /**
@@ -53,7 +51,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     public function providerOR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data');
     }
 
     /**
@@ -69,7 +67,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     public function providerNOT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
     }
 
     /**
@@ -85,7 +83,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     public function providerIF()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data');
     }
 
     /**
@@ -101,6 +99,6 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     public function providerIFERROR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/LookupRefTest.php b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php
similarity index 77%
rename from unitTests/Classes/src/Calculation/LookupRefTest.php
rename to tests/PhpSpreadsheet/Calculation/LookupRefTest.php
index 43a71088..d1134c63 100644
--- a/unitTests/Classes/src/Calculation/LookupRefTest.php
+++ b/tests/PhpSpreadsheet/Calculation/LookupRefTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 /**
  * Class LookupRefTest
@@ -30,7 +28,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
 
     public function providerHLOOKUP()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
     }
 
     /**
@@ -47,6 +45,6 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
 
     public function providerVLOOKUP()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/MathTrigTest.php b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php
similarity index 79%
rename from unitTests/Classes/src/Calculation/MathTrigTest.php
rename to tests/PhpSpreadsheet/Calculation/MathTrigTest.php
index 9b1962ed..9715e39c 100644
--- a/unitTests/Classes/src/Calculation/MathTrigTest.php
+++ b/tests/PhpSpreadsheet/Calculation/MathTrigTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class MathTrigTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +23,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerATAN2()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
     }
 
     /**
@@ -41,7 +39,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerCEILING()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
     }
 
     /**
@@ -57,7 +55,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerCOMBIN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
     }
 
     /**
@@ -73,7 +71,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerEVEN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
     }
 
     /**
@@ -89,7 +87,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerODD()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
     }
 
     /**
@@ -105,7 +103,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerFACT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
     }
 
     /**
@@ -121,7 +119,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerFACTDOUBLE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
     }
 
     /**
@@ -137,7 +135,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerFLOOR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
     }
 
     /**
@@ -153,7 +151,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerGCD()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
     }
 
     /**
@@ -169,7 +167,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerLCM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
     }
 
     /**
@@ -185,7 +183,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerINT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
     }
 
     /**
@@ -201,7 +199,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerSIGN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
     }
 
     /**
@@ -217,7 +215,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerPOWER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
     }
 
     /**
@@ -233,7 +231,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerLOG()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
     }
 
     /**
@@ -249,7 +247,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMOD()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
     }
 
     /**
@@ -266,7 +264,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMDETERM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
     }
 
     /**
@@ -283,7 +281,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMINVERSE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
     }
 
     /**
@@ -300,7 +298,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMMULT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
     }
 
     /**
@@ -316,7 +314,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMULTINOMIAL()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
     }
 
     /**
@@ -334,7 +332,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerMROUND()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
     }
 
     /**
@@ -350,7 +348,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerPRODUCT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
     }
 
     /**
@@ -366,7 +364,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerQUOTIENT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
     }
 
     /**
@@ -382,7 +380,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerROUNDUP()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
     }
 
     /**
@@ -398,7 +396,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerROUNDDOWN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
     }
 
     /**
@@ -414,7 +412,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerSERIESSUM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
     }
 
     /**
@@ -430,7 +428,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerSUMSQ()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
     }
 
     /**
@@ -446,7 +444,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerTRUNC()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
     }
 
     /**
@@ -462,7 +460,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerROMAN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
     }
 
     /**
@@ -478,7 +476,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     public function providerSQRTPI()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
     }
 
     /**
diff --git a/unitTests/Classes/src/Calculation/TextDataTest.php b/tests/PhpSpreadsheet/Calculation/TextDataTest.php
similarity index 77%
rename from unitTests/Classes/src/Calculation/TextDataTest.php
rename to tests/PhpSpreadsheet/Calculation/TextDataTest.php
index fad2ae02..949ce7ea 100644
--- a/unitTests/Classes/src/Calculation/TextDataTest.php
+++ b/tests/PhpSpreadsheet/Calculation/TextDataTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Calculation;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Calculation;
 
 class TextDataTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +23,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerCHAR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
     }
 
     /**
@@ -41,7 +39,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerCODE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
     }
 
     /**
@@ -57,7 +55,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerCONCATENATE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
     }
 
     /**
@@ -73,7 +71,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerLEFT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
     }
 
     /**
@@ -89,7 +87,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerMID()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data');
     }
 
     /**
@@ -105,7 +103,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerRIGHT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
     }
 
     /**
@@ -121,7 +119,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerLOWER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
     }
 
     /**
@@ -137,7 +135,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerUPPER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
     }
 
     /**
@@ -153,7 +151,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerPROPER()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
     }
 
     /**
@@ -169,7 +167,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerLEN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
     }
 
     /**
@@ -185,7 +183,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerSEARCH()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
     }
 
     /**
@@ -201,7 +199,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerFIND()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
     }
 
     /**
@@ -217,7 +215,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerREPLACE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
     }
 
     /**
@@ -233,7 +231,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerSUBSTITUTE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
     }
 
     /**
@@ -249,7 +247,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerTRIM()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
     }
 
     /**
@@ -265,7 +263,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerCLEAN()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
     }
 
     /**
@@ -281,7 +279,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerDOLLAR()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
     }
 
     /**
@@ -297,7 +295,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerFIXED()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
     }
 
     /**
@@ -313,7 +311,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data');
     }
 
     /**
@@ -334,7 +332,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerTEXT()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
     }
 
     /**
@@ -354,6 +352,6 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     public function providerVALUE()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
     }
 }
diff --git a/unitTests/Classes/src/CalculationTest.php b/tests/PhpSpreadsheet/CalculationTest.php
similarity index 86%
rename from unitTests/Classes/src/CalculationTest.php
rename to tests/PhpSpreadsheet/CalculationTest.php
index 1fcb1735..5d72100b 100644
--- a/unitTests/Classes/src/CalculationTest.php
+++ b/tests/PhpSpreadsheet/CalculationTest.php
@@ -2,8 +2,6 @@
 
 namespace PHPExcel;
 
-require_once 'testDataFileIterator.php';
-
 class CalculationTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -27,6 +25,6 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
 
     public function providerBinaryComparisonOperation()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data');
     }
 }
diff --git a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php
similarity index 98%
rename from unitTests/Classes/src/Cell/AdvancedValueBinderTest.php
rename to tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php
index 62aad5b8..684a7eda 100644
--- a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php
+++ b/tests/PhpSpreadsheet/Cell/AdvancedValueBinderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Cell;
+namespace PhpSpreadsheet\Tests\Cell;
 
 class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Cell/DataTypeTest.php b/tests/PhpSpreadsheet/Cell/DataTypeTest.php
similarity index 93%
rename from unitTests/Classes/src/Cell/DataTypeTest.php
rename to tests/PhpSpreadsheet/Cell/DataTypeTest.php
index 601eaa27..f8ae5bf8 100644
--- a/unitTests/Classes/src/Cell/DataTypeTest.php
+++ b/tests/PhpSpreadsheet/Cell/DataTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Cell;
+namespace PhpSpreadsheet\Tests\Cell;
 
 class DataTypeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php
similarity index 92%
rename from unitTests/Classes/src/Cell/DefaultValueBinderTest.php
rename to tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php
index ef4dc71d..10e8e1f8 100644
--- a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php
+++ b/tests/PhpSpreadsheet/Cell/DefaultValueBinderTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Cell;
-
-require_once 'testDataFileIteratorJson.php';
+namespace PhpSpreadsheet\Tests\Cell;
 
 class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
 {
@@ -69,7 +67,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
 
     public function providerDataTypeForValue()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
+        return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
     }
 
     public function testDataTypeForRichTextObject()
diff --git a/unitTests/Classes/src/Cell/HyperlinkTest.php b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php
similarity index 98%
rename from unitTests/Classes/src/Cell/HyperlinkTest.php
rename to tests/PhpSpreadsheet/Cell/HyperlinkTest.php
index 8586544c..701b86ad 100644
--- a/unitTests/Classes/src/Cell/HyperlinkTest.php
+++ b/tests/PhpSpreadsheet/Cell/HyperlinkTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Cell;
+namespace PhpSpreadsheet\Tests\Cell;
 
 class HyperlinkTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/CellTest.php b/tests/PhpSpreadsheet/CellTest.php
similarity index 87%
rename from unitTests/Classes/src/CellTest.php
rename to tests/PhpSpreadsheet/CellTest.php
index f4649f16..6f45eb2e 100644
--- a/unitTests/Classes/src/CellTest.php
+++ b/tests/PhpSpreadsheet/CellTest.php
@@ -2,8 +2,6 @@
 
 namespace PHPExcel;
 
-require_once 'testDataFileIterator.php';
-
 class CellTest extends \PHPUnit_Framework_TestCase
 {
 
@@ -24,7 +22,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerColumnString()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnString.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnString.data');
     }
 
     public function testColumnIndexFromStringTooLong()
@@ -66,7 +64,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerColumnIndex()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnIndex.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/ColumnIndex.data');
     }
 
     /**
@@ -82,7 +80,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerCoordinates()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellCoordinates.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellCoordinates.data');
     }
 
     public function testCoordinateFromStringWithRangeAddress()
@@ -137,7 +135,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerAbsoluteCoordinates()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data');
     }
 
     public function testAbsoluteCoordinateFromStringWithRangeAddress()
@@ -166,7 +164,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerAbsoluteReferences()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data');
     }
 
     public function testAbsoluteReferenceFromStringWithRangeAddress()
@@ -201,7 +199,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerSplitRange()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellSplitRange.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellSplitRange.data');
     }
 
     /**
@@ -217,7 +215,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerBuildRange()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellBuildRange.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellBuildRange.data');
     }
 
     public function testBuildRangeInvalid()
@@ -246,7 +244,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerRangeBoundaries()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data');
     }
 
     /**
@@ -262,7 +260,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerRangeDimension()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeDimension.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellRangeDimension.data');
     }
 
     /**
@@ -278,7 +276,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerGetRangeBoundaries()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data');
     }
 
     /**
@@ -294,6 +292,6 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     public function providerExtractAllCellReferencesInRange()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data');
     }
 }
diff --git a/unitTests/Classes/src/Chart/DataSeriesValuesTest.php b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php
similarity index 93%
rename from unitTests/Classes/src/Chart/DataSeriesValuesTest.php
rename to tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php
index 7812df2e..51517ce0 100644
--- a/unitTests/Classes/src/Chart/DataSeriesValuesTest.php
+++ b/tests/PhpSpreadsheet/Chart/DataSeriesValuesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Chart;
+namespace PhpSpreadsheet\Tests\Chart;
 
 class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +25,7 @@ class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase
 
         try {
             $result = $testInstance->setDataType('BOOLEAN');
-        } catch (Exception $e) {
+        } catch (\PHPExcel\Exception $e) {
             $this->assertEquals($e->getMessage(), 'Invalid datatype for chart data series values');
             return;
         }
diff --git a/unitTests/Classes/src/Chart/LayoutTest.php b/tests/PhpSpreadsheet/Chart/LayoutTest.php
similarity index 94%
rename from unitTests/Classes/src/Chart/LayoutTest.php
rename to tests/PhpSpreadsheet/Chart/LayoutTest.php
index 24351207..c4817e58 100644
--- a/unitTests/Classes/src/Chart/LayoutTest.php
+++ b/tests/PhpSpreadsheet/Chart/LayoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Chart;
+namespace PhpSpreadsheet\Tests\Chart;
 
 class LayoutTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Chart/LegendTest.php b/tests/PhpSpreadsheet/Chart/LegendTest.php
similarity index 99%
rename from unitTests/Classes/src/Chart/LegendTest.php
rename to tests/PhpSpreadsheet/Chart/LegendTest.php
index e51fbe9d..bd196038 100644
--- a/unitTests/Classes/src/Chart/LegendTest.php
+++ b/tests/PhpSpreadsheet/Chart/LegendTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Chart;
+namespace PhpSpreadsheet\Tests\Chart;
 
 class LegendTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/custom/Complex.php b/tests/PhpSpreadsheet/Custom/Complex.php
similarity index 99%
rename from unitTests/custom/Complex.php
rename to tests/PhpSpreadsheet/Custom/Complex.php
index 63a89ef5..6c20c4ae 100644
--- a/unitTests/custom/Complex.php
+++ b/tests/PhpSpreadsheet/Custom/Complex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSpreadhsheet\unitTests\custom;
+namespace PhpSpreadsheet\Tests\Custom;
 
 class Complex
 {
diff --git a/unitTests/custom/complexAssert.php b/tests/PhpSpreadsheet/Custom/ComplexAssert.php
similarity index 95%
rename from unitTests/custom/complexAssert.php
rename to tests/PhpSpreadsheet/Custom/ComplexAssert.php
index 4ce64e38..290838c8 100644
--- a/unitTests/custom/complexAssert.php
+++ b/tests/PhpSpreadsheet/Custom/ComplexAssert.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PhpSpreadhsheet\unitTests\custom;
-
-include_once dirname(__FILE__).'/Complex.php';
+namespace PhpSpreadsheet\Tests\Custom;
 
 class ComplexAssert
 {
diff --git a/unitTests/Classes/src/Reader/XEEValidatorTest.php b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php
similarity index 97%
rename from unitTests/Classes/src/Reader/XEEValidatorTest.php
rename to tests/PhpSpreadsheet/Reader/XEEValidatorTest.php
index d408994f..9f27c12d 100644
--- a/unitTests/Classes/src/Reader/XEEValidatorTest.php
+++ b/tests/PhpSpreadsheet/Reader/XEEValidatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Reader;
+namespace PhpSpreadsheet\Tests\Reader;
 
 class XEEValidatorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/ReferenceHelperTest.php b/tests/PhpSpreadsheet/ReferenceHelperTest.php
similarity index 100%
rename from unitTests/Classes/src/ReferenceHelperTest.php
rename to tests/PhpSpreadsheet/ReferenceHelperTest.php
diff --git a/unitTests/classes/src/SettingsTest.php b/tests/PhpSpreadsheet/SettingsTest.php
similarity index 100%
rename from unitTests/classes/src/SettingsTest.php
rename to tests/PhpSpreadsheet/SettingsTest.php
diff --git a/unitTests/Classes/src/Shared/CodePageTest.php b/tests/PhpSpreadsheet/Shared/CodePageTest.php
similarity index 88%
rename from unitTests/Classes/src/Shared/CodePageTest.php
rename to tests/PhpSpreadsheet/Shared/CodePageTest.php
index 80979d86..0efdff94 100644
--- a/unitTests/Classes/src/Shared/CodePageTest.php
+++ b/tests/PhpSpreadsheet/Shared/CodePageTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class CodePageTest extends \PHPUnit_Framework_TestCase
 {
@@ -19,7 +17,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase
 
     public function providerCodePage()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CodePage.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CodePage.data');
     }
 
     public function testNumberToNameWithInvalidCodePage()
diff --git a/unitTests/Classes/src/Shared/DateTest.php b/tests/PhpSpreadsheet/Shared/DateTest.php
similarity index 84%
rename from unitTests/Classes/src/Shared/DateTest.php
rename to tests/PhpSpreadsheet/Shared/DateTest.php
index cf531a81..edb13c71 100644
--- a/unitTests/Classes/src/Shared/DateTest.php
+++ b/tests/PhpSpreadsheet/Shared/DateTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class DateTest extends \PHPUnit_Framework_TestCase
 {
@@ -47,7 +45,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1900()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data');
     }
 
     /**
@@ -68,7 +66,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimePHPToExcel1900()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data');
     }
 
     /**
@@ -89,7 +87,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimeFormattedPHPToExcel1900()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data');
     }
 
     /**
@@ -113,7 +111,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1904()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data');
     }
 
     /**
@@ -134,7 +132,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimePHPToExcel1904()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data');
     }
 
     /**
@@ -150,7 +148,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerIsDateTimeFormatCode()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data');
     }
 
     /**
@@ -175,6 +173,6 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1900Timezone()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/FileTest.php b/tests/PhpSpreadsheet/Shared/FileTest.php
similarity index 92%
rename from unitTests/Classes/src/Shared/FileTest.php
rename to tests/PhpSpreadsheet/Shared/FileTest.php
index 70c9758f..46478e6e 100644
--- a/unitTests/Classes/src/Shared/FileTest.php
+++ b/tests/PhpSpreadsheet/Shared/FileTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class FileTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Shared/FontTest.php b/tests/PhpSpreadsheet/Shared/FontTest.php
similarity index 84%
rename from unitTests/Classes/src/Shared/FontTest.php
rename to tests/PhpSpreadsheet/Shared/FontTest.php
index 08c0c2c5..ebed03f9 100644
--- a/unitTests/Classes/src/Shared/FontTest.php
+++ b/tests/PhpSpreadsheet/Shared/FontTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class FontTest extends \PHPUnit_Framework_TestCase
 {
@@ -48,7 +46,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     public function providerFontSizeToPixels()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
     }
 
     /**
@@ -64,7 +62,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     public function providerInchSizeToPixels()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
     }
 
     /**
@@ -80,6 +78,6 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     public function providerCentimeterSizeToPixels()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/PasswordHasherTest.php b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php
similarity index 73%
rename from unitTests/Classes/src/Shared/PasswordHasherTest.php
rename to tests/PhpSpreadsheet/Shared/PasswordHasherTest.php
index f05ad297..c779a366 100644
--- a/unitTests/Classes/src/Shared/PasswordHasherTest.php
+++ b/tests/PhpSpreadsheet/Shared/PasswordHasherTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class PasswordHasherTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,6 +18,6 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase
 
     public function providerHashPassword()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/StringTest.php b/tests/PhpSpreadsheet/Shared/StringTest.php
similarity index 97%
rename from unitTests/Classes/src/Shared/StringTest.php
rename to tests/PhpSpreadsheet/Shared/StringTest.php
index dad8ffad..389a8d06 100644
--- a/unitTests/Classes/src/Shared/StringTest.php
+++ b/tests/PhpSpreadsheet/Shared/StringTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Shared;
 
 class StringTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Shared/TimeZoneTest.php b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php
similarity index 95%
rename from unitTests/Classes/src/Shared/TimeZoneTest.php
rename to tests/PhpSpreadsheet/Shared/TimeZoneTest.php
index 9d7fe7bb..ed0b4852 100644
--- a/unitTests/Classes/src/Shared/TimeZoneTest.php
+++ b/tests/PhpSpreadsheet/Shared/TimeZoneTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Shared;
+namespace PhpSpreadsheet\Tests\Shared;
 
 class TimeZoneTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Style/ColorTest.php b/tests/PhpSpreadsheet/Style/ColorTest.php
similarity index 74%
rename from unitTests/Classes/src/Style/ColorTest.php
rename to tests/PhpSpreadsheet/Style/ColorTest.php
index 3b3ccaa8..c16b6ccb 100644
--- a/unitTests/Classes/src/Style/ColorTest.php
+++ b/tests/PhpSpreadsheet/Style/ColorTest.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace PHPExcel\Style;
-
-require_once 'testDataFileIterator.php';
-require_once 'testDataFileIteratorJson.php';
+namespace PhpSpreadsheet\Tests\Style;
 
 class ColorTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +17,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     public function providerColorGetRed()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data');
     }
 
     /**
@@ -36,7 +33,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     public function providerColorGetGreen()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data');
     }
 
     /**
@@ -52,7 +49,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     public function providerColorGetBlue()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data');
     }
 
     /**
@@ -67,6 +64,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     public function providerColorChangeBrightness()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
+        return new \PhpSpreadsheet\Tests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
     }
 }
diff --git a/unitTests/Classes/src/Style/NumberFormatDateTest.php b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php
similarity index 78%
rename from unitTests/Classes/src/Style/NumberFormatDateTest.php
rename to tests/PhpSpreadsheet/Style/NumberFormatDateTest.php
index 537db59e..5bfeac78 100644
--- a/unitTests/Classes/src/Style/NumberFormatDateTest.php
+++ b/tests/PhpSpreadsheet/Style/NumberFormatDateTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Style;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Style;
 
 class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,6 +24,6 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
 
     public function providerNumberFormat()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data');
     }
 }
diff --git a/unitTests/Classes/src/Style/NumberFormatTest.php b/tests/PhpSpreadsheet/Style/NumberFormatTest.php
similarity index 78%
rename from unitTests/Classes/src/Style/NumberFormatTest.php
rename to tests/PhpSpreadsheet/Style/NumberFormatTest.php
index fe3895d5..ad192b20 100644
--- a/unitTests/Classes/src/Style/NumberFormatTest.php
+++ b/tests/PhpSpreadsheet/Style/NumberFormatTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace PHPExcel\Style;
-
-require_once 'testDataFileIterator.php';
+namespace PhpSpreadsheet\Tests\Style;
 
 class NumberFormatTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,6 +24,6 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
 
     public function providerNumberFormat()
     {
-        return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormat.data');
+        return new \PhpSpreadsheet\Tests\TestDataFileIterator('rawTestData/Style/NumberFormat.data');
     }
 }
diff --git a/unitTests/testDataFileIterator.php b/tests/PhpSpreadsheet/TestDataFileIterator.php
similarity index 99%
rename from unitTests/testDataFileIterator.php
rename to tests/PhpSpreadsheet/TestDataFileIterator.php
index 932039d7..13d1ad05 100644
--- a/unitTests/testDataFileIterator.php
+++ b/tests/PhpSpreadsheet/TestDataFileIterator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSpreadhsheet\unitTests;
+namespace PhpSpreadsheet\Tests;
 
 class TestDataFileIterator implements \Iterator
 {
diff --git a/unitTests/testDataFileIteratorJson.php b/tests/PhpSpreadsheet/TestDataFileIteratorJson.php
similarity index 97%
rename from unitTests/testDataFileIteratorJson.php
rename to tests/PhpSpreadsheet/TestDataFileIteratorJson.php
index 7e85dc4b..7119e9a0 100644
--- a/unitTests/testDataFileIteratorJson.php
+++ b/tests/PhpSpreadsheet/TestDataFileIteratorJson.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSpreadhsheet\unitTests;
+namespace PhpSpreadsheet\Tests;
 
 class TestDataFileIteratorJson implements \Iterator
 {
diff --git a/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilter/Column/RuleTest.php
similarity index 98%
rename from unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php
rename to tests/PhpSpreadsheet/Worksheet/AutoFilter/Column/RuleTest.php
index ec83ac96..6939d4ee 100644
--- a/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/AutoFilter/Column/RuleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet\AutoFilter\Column;
+namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter\Column;
 
 class RuleTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php
similarity index 99%
rename from unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php
rename to tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php
index 04ba1854..deed5c39 100644
--- a/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/AutoFilter/ColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet\AutoFilter;
+namespace PhpSpreadsheet\Tests\Worksheet\AutoFilter;
 
 class AutofilterColumnTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php
similarity index 99%
rename from unitTests/Classes/src/Worksheet/AutoFilterTest.php
rename to tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php
index b7735663..710b5e99 100644
--- a/unitTests/Classes/src/Worksheet/AutoFilterTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/AutoFilterTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
+
+use PHPExcel\Worksheet\AutoFilter;
 
 class AutoFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/CellCollectionTest.php b/tests/PhpSpreadsheet/Worksheet/CellCollectionTest.php
similarity index 94%
rename from unitTests/Classes/src/Worksheet/CellCollectionTest.php
rename to tests/PhpSpreadsheet/Worksheet/CellCollectionTest.php
index 1b71933b..83bfcd3a 100644
--- a/unitTests/Classes/src/Worksheet/CellCollectionTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/CellCollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
 
 class CellCollectionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/ColumnCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php
similarity index 96%
rename from unitTests/Classes/src/Worksheet/ColumnCellIteratorTest.php
rename to tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php
index 3c46a725..a25492b2 100644
--- a/unitTests/Classes/src/Worksheet/ColumnCellIteratorTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
+
+use PHPExcel\Worksheet\ColumnCellIterator;
 
 class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +33,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
         $iterator = new ColumnCellIterator($this->mockWorksheet, 'A');
         $ColumnCellIndexResult = 1;
         $this->assertEquals($ColumnCellIndexResult, $iterator->key());
-        
+
         foreach ($iterator as $key => $ColumnCell) {
             $this->assertEquals($ColumnCellIndexResult++, $key);
             $this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell);
@@ -43,7 +45,7 @@ class ColumnCellIteratorTest extends \PHPUnit_Framework_TestCase
         $iterator = new ColumnCellIterator($this->mockWorksheet, 'A', 2, 4);
         $ColumnCellIndexResult = 2;
         $this->assertEquals($ColumnCellIndexResult, $iterator->key());
-        
+
         foreach ($iterator as $key => $ColumnCell) {
             $this->assertEquals($ColumnCellIndexResult++, $key);
             $this->assertInstanceOf('\\PHPExcel\\Cell', $ColumnCell);
diff --git a/unitTests/Classes/src/Worksheet/ColumnIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php
similarity index 96%
rename from unitTests/Classes/src/Worksheet/ColumnIteratorTest.php
rename to tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php
index 0b4e2bf9..14c23fc3 100644
--- a/unitTests/Classes/src/Worksheet/ColumnIteratorTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
+
+use PHPExcel\Worksheet\ColumnIterator;
 
 class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +33,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
         $iterator = new ColumnIterator($this->mockWorksheet);
         $columnIndexResult = 'A';
         $this->assertEquals($columnIndexResult, $iterator->key());
-        
+
         foreach ($iterator as $key => $column) {
             $this->assertEquals($columnIndexResult++, $key);
             $this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column);
@@ -43,7 +45,7 @@ class ColumnIteratorTest extends \PHPUnit_Framework_TestCase
         $iterator = new ColumnIterator($this->mockWorksheet, 'B', 'D');
         $columnIndexResult = 'B';
         $this->assertEquals($columnIndexResult, $iterator->key());
-        
+
         foreach ($iterator as $key => $column) {
             $this->assertEquals($columnIndexResult++, $key);
             $this->assertInstanceOf('\\PHPExcel\\Worksheet\\Column', $column);
diff --git a/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php
similarity index 98%
rename from unitTests/Classes/src/Worksheet/RowCellIteratorTest.php
rename to tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php
index 58dca140..eed9e2e6 100644
--- a/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
 
 class RowCellIteratorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/RowIteratorTest.php b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php
similarity index 98%
rename from unitTests/Classes/src/Worksheet/RowIteratorTest.php
rename to tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php
index 65c41c12..e532a65c 100644
--- a/unitTests/Classes/src/Worksheet/RowIteratorTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
 
 class RowIteratorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php
similarity index 96%
rename from unitTests/Classes/src/Worksheet/WorksheetColumnTest.php
rename to tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php
index 510fc8e4..356bd727 100644
--- a/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
 
 class WorksheetColumnTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/Classes/src/Worksheet/WorksheetRowTest.php b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php
similarity index 96%
rename from unitTests/Classes/src/Worksheet/WorksheetRowTest.php
rename to tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php
index c2cf403c..5f241158 100644
--- a/unitTests/Classes/src/Worksheet/WorksheetRowTest.php
+++ b/tests/PhpSpreadsheet/Worksheet/WorksheetRowTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPExcel\Worksheet;
+namespace PhpSpreadsheet\Tests\Worksheet;
 
 class WorksheetRowTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/unitTests/bootstrap.php b/tests/bootstrap.php
similarity index 97%
rename from unitTests/bootstrap.php
rename to tests/bootstrap.php
index 19959f1b..885f592a 100644
--- a/unitTests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -40,8 +40,6 @@ if (!defined('PHPEXCEL_ROOT')) {
 }
 require_once(PHPEXCEL_ROOT . 'Bootstrap.php');
 
-require_once 'testDataFileIterator.php';
-
 /**
  * @todo Sort out xdebug in vagrant so that this works in all sandboxes
  * For now, it is safer to test for it rather then remove it.
diff --git a/unitTests/rawTestData/Calculation/DateTime/DATE.data b/tests/rawTestData/Calculation/DateTime/DATE.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/DateTime/DATE.data
rename to tests/rawTestData/Calculation/DateTime/DATE.data
index d7031e8f..cdcc776b 100644
--- a/unitTests/rawTestData/Calculation/DateTime/DATE.data
+++ b/tests/rawTestData/Calculation/DateTime/DATE.data
@@ -1,79 +1,79 @@
-# Year	Month	Day		Result		Comments
-18,	11,	11,		6890
-1900,	1,	1,		1		//	Excel 1900 Calendar Base Date
-1900,	2,	28,		59		//	Day before Excel mythical 1900 leap day
-1900,	2,	29,		60		//	Excel mythical 1900 leap day
-1900,	3,	1,		61		//	Day after Excel mythical 1900 leap day
-1901,	12,	13,		713		//	Day after Excel mythical 1900 leap day
-1901,	12,	14,		714		//	PHP 32-bit Earliest Date
-1903,	12,	31,		1461
-1904,	1,	1,		1462		//	Excel 1904 Calendar Base Date
-1904,	1,	2,		1463
-1960,	12,	19,		22269
-1970,	1,	1,		25569		//	PHP Base Date
-1982,	12,	7,		30292
-2008,	6,	12,		39611
-2038,	1,	19,		50424		//	PHP 32-bit Latest Date
-2038,	1,	20,		50425		//	Day after PHP 32-bit Latest Date
-2008,	1,	1,		39448
-2008,	1,	,		39447
-2008,	1,	-1,		39446
-2008,	1,	-30,		39417
-2008,	1,	-31,		39416
-2008,	1,	-365,		39082
-2008,	3,	1,		39508
-2008,	3,	,		39507
-2008,	3,	-1,		39506
-2008,	3,	-365,		39142
-2008,	,	1,		39417
-2008,	-1,	1,		39387
-2008,	-11,	1,		39083
-2008,	-12,	1,		39052
-2008,	-13,	1,		39022
-2008,	-13,	30,		39051
-2008,	-13,	,		39021
-2008,	-13,	-30,		38991
-2008,	-13,	-31,		38990
-2008,	13,	1,		39814
-2007,	15,	,		39507
-2008,	26,	1,		40210
-2008,	26,	-10,		40199
-2008,	-26,	61,		38686
-2010,	-15,	-50,		39641
-2010,	-15,	50,		39741
-2010,	15,	-50,		40552
-2010,	15,	50,		40652
-2010,	1.5,	1,		40179
-2010,	1.5,	0,		40178
-2010,	0,	1.5,		40148
-2010,	1,	1.5,		40179
-2012,	6,	15,		41075
-2012,	6,	,		41060
-2012,	,	15,		40892
-,	6,	15,		167
-10,	6,	15,		3819
-10,	,	,		3622
-,	10,	,		274
-,	,	10,		"#NUM!"
--20,	,	,		"#NUM!"
--20,	6,	15,		"#NUM!"
-9999,	12,	31,		2958465		//	Excel Maximum Date
-10000,	1,	1,		"#NUM!"		//	Exceeded Excel Maximum Date
-2008,	8,	10,		39670
-2008,	12,	31,		39813
-2008,	8,	32,		39692
-2008,	13,	31,		39844
-2009,	1,	0,		39813
-2009,	1,	-1,		39812
-2009,	0,	0,		39782
-2009,	0,	-1,		39781
-2009,	-1,	0,		39752
-2009,	-1,	-1,		39751
-2010,	0,	-1,		40146
-2010,	5,	31,		40329
-2010,	1,	'21st',		40199		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-2010,	"March",'21st',		40258		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-2010,	"March",21,		40258		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"ABC",	1,	21,		"#VALUE!"
-2010,	"DEF",	21,		"#VALUE!"
-2010,	3,	"GHI",		"#VALUE!"
+# Year	Month	Day		Result		Comments
+18,	11,	11,		6890
+1900,	1,	1,		1		//	Excel 1900 Calendar Base Date
+1900,	2,	28,		59		//	Day before Excel mythical 1900 leap day
+1900,	2,	29,		60		//	Excel mythical 1900 leap day
+1900,	3,	1,		61		//	Day after Excel mythical 1900 leap day
+1901,	12,	13,		713		//	Day after Excel mythical 1900 leap day
+1901,	12,	14,		714		//	PHP 32-bit Earliest Date
+1903,	12,	31,		1461
+1904,	1,	1,		1462		//	Excel 1904 Calendar Base Date
+1904,	1,	2,		1463
+1960,	12,	19,		22269
+1970,	1,	1,		25569		//	PHP Base Date
+1982,	12,	7,		30292
+2008,	6,	12,		39611
+2038,	1,	19,		50424		//	PHP 32-bit Latest Date
+2038,	1,	20,		50425		//	Day after PHP 32-bit Latest Date
+2008,	1,	1,		39448
+2008,	1,	,		39447
+2008,	1,	-1,		39446
+2008,	1,	-30,		39417
+2008,	1,	-31,		39416
+2008,	1,	-365,		39082
+2008,	3,	1,		39508
+2008,	3,	,		39507
+2008,	3,	-1,		39506
+2008,	3,	-365,		39142
+2008,	,	1,		39417
+2008,	-1,	1,		39387
+2008,	-11,	1,		39083
+2008,	-12,	1,		39052
+2008,	-13,	1,		39022
+2008,	-13,	30,		39051
+2008,	-13,	,		39021
+2008,	-13,	-30,		38991
+2008,	-13,	-31,		38990
+2008,	13,	1,		39814
+2007,	15,	,		39507
+2008,	26,	1,		40210
+2008,	26,	-10,		40199
+2008,	-26,	61,		38686
+2010,	-15,	-50,		39641
+2010,	-15,	50,		39741
+2010,	15,	-50,		40552
+2010,	15,	50,		40652
+2010,	1.5,	1,		40179
+2010,	1.5,	0,		40178
+2010,	0,	1.5,		40148
+2010,	1,	1.5,		40179
+2012,	6,	15,		41075
+2012,	6,	,		41060
+2012,	,	15,		40892
+,	6,	15,		167
+10,	6,	15,		3819
+10,	,	,		3622
+,	10,	,		274
+,	,	10,		"#NUM!"
+-20,	,	,		"#NUM!"
+-20,	6,	15,		"#NUM!"
+9999,	12,	31,		2958465		//	Excel Maximum Date
+10000,	1,	1,		"#NUM!"		//	Exceeded Excel Maximum Date
+2008,	8,	10,		39670
+2008,	12,	31,		39813
+2008,	8,	32,		39692
+2008,	13,	31,		39844
+2009,	1,	0,		39813
+2009,	1,	-1,		39812
+2009,	0,	0,		39782
+2009,	0,	-1,		39781
+2009,	-1,	0,		39752
+2009,	-1,	-1,		39751
+2010,	0,	-1,		40146
+2010,	5,	31,		40329
+2010,	1,	'21st',		40199		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+2010,	"March",'21st',		40258		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+2010,	"March",21,		40258		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"ABC",	1,	21,		"#VALUE!"
+2010,	"DEF",	21,		"#VALUE!"
+2010,	3,	"GHI",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/DATEDIF.data b/tests/rawTestData/Calculation/DateTime/DATEDIF.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/DateTime/DATEDIF.data
rename to tests/rawTestData/Calculation/DateTime/DATEDIF.data
index 9aa1a524..4f344aaa 100644
--- a/unitTests/rawTestData/Calculation/DateTime/DATEDIF.data
+++ b/tests/rawTestData/Calculation/DateTime/DATEDIF.data
@@ -1,96 +1,96 @@
-"ABC",		"2007-1-10",	"Y",	"#VALUE!"
-"2007-1-1",	"DEF",		"Y",	"#VALUE!"
-"2007-1-1",	"2007-1-10",	"XYZ",	"#VALUE!"
-"2007-1-10",	"2007-1-1",	"Y",	"#NUM!"
-"2007-12-31",	"2008-1-10",	"Y",	0
-"2007-1-1",	"2007-1-10",	"Y",	0
-"2007-1-1",	"2007-1-10",	"M",	0
-"2007-1-1",	"2007-1-10",	"D",	9
-"2007-1-1",	"2007-1-10",	"YM",	0
-"2007-1-1",	"2007-1-10",	"YD",	9
-"2007-1-1",	"2007-1-10",	"MD",	9
-"2007-1-1",	"2007-12-31",	"Y",	0
-"2007-1-1",	"2007-12-31",	"M",	11
-"2007-1-1",	"2007-12-31",	"D",	364
-"2007-1-1",	"2007-12-31",	"YM",	11
-"2007-1-1",	"2007-12-31",	"YD",	364
-"2007-1-1",	"2007-12-31",	"MD",	30
-"2007-1-1",	"2008-7-1",	"Y",	1
-"2007-1-1",	"2008-7-1",	"M",	18
-"2007-1-1",	"2008-7-1",	"D",	547
-"2007-1-1",	"2008-7-1",	"YM",	6
-"2007-1-1",	"2008-7-1",	"YD",	181
-"2007-1-1",	"2008-7-1",	"MD",	0
-"2007-1-1",	"2007-1-31",	"Y",	0
-"2007-1-1",	"2007-1-31",	"M",	0
-"2007-1-1",	"2007-1-31",	"D",	30
-"2007-1-1",	"2007-1-31",	"YM",	0
-"2007-1-1",	"2007-1-31",	"YD",	30
-"2007-1-1",	"2007-1-31",	"MD",	30
-"2007-1-1",	"2007-2-1",	"Y",	0
-"2007-1-1",	"2007-2-1",	"M",	1
-"2007-1-1",	"2007-2-1",	"D",	31
-"2007-1-1",	"2007-2-1",	"YM",	1
-"2007-1-1",	"2007-2-1",	"YD",	31
-"2007-1-1",	"2007-2-1",	"MD",	0
-"2007-1-1",	"2007-2-28",	"Y",	0
-"2007-1-1",	"2007-2-28",	"M",	1
-"2007-1-1",	"2007-2-28",	"D",	58
-"2007-1-1",	"2007-2-28",	"YM",	1
-"2007-1-1",	"2007-2-28",	"YD",	58
-"2007-1-1",	"2007-2-28",	"MD",	27
-"2007-1-31",	"2007-2-1",	"Y",	0
-"2007-1-31",	"2007-2-1",	"M",	0
-"2007-1-31",	"2007-2-1",	"D",	1
-"2007-1-31",	"2007-2-1",	"YM",	0
-"2007-1-31",	"2007-2-1",	"YD",	1
-"2007-1-31",	"2007-2-1",	"MD",	1
-"2007-1-31",	"2007-3-1",	"Y",	0
-"2007-1-31",	"2007-3-1",	"M",	1
-"2007-1-31",	"2007-3-1",	"D",	29
-"2007-1-31",	"2007-3-1",	"YM",	1
-"2007-1-31",	"2007-3-1",	"YD",	29
-"2007-1-31",	"2007-3-1",	"MD",	-2
-"2007-1-31",	"2007-3-31",	"Y",	0
-"2007-1-31",	"2007-3-31",	"M",	2
-"2007-1-31",	"2007-3-31",	"D",	59
-"2007-1-31",	"2007-3-31",	"YM",	2
-"2007-1-31",	"2007-3-31",	"YD",	59
-"2007-1-31",	"2007-3-31",	"MD",	0
-"2008-1-1",	"2008-9-1",	"Y",	0
-"2008-1-1",	"2008-9-1",	"M",	8
-"2008-1-1",	"2008-9-1",	"D",	244
-"2008-1-1",	"2008-9-1",	"YM",	8
-"2008-1-1",	"2008-9-1",	"YD",	244
-"2008-1-1",	"2008-9-1",	"MD",	0
-"2007-2-1",	"2008-4-1",	"Y",	1
-"2007-2-1",	"2008-4-1",	"M",	14
-"2007-2-1",	"2008-4-1",	"D",	425
-"2007-2-1",	"2008-4-1",	"YM",	2
-"2007-2-1",	"2008-4-1",	"YD",	59
-"2007-2-1",	"2008-4-1",	"MD",	0
-"1960-12-19",	"2008-6-28",	"Y",	47
-"1960-12-19",	"2008-6-28",	"M",	570
-"1960-12-19",	"2008-6-28",	"D",	17358
-"1960-12-19",	"2008-6-28",	"YM",	6
-"1960-12-19",	"2008-6-28",	"YD",	191
-"1960-12-19",	"2008-6-28",	"MD",	9
-"1982-12-7",	"2008-6-28",	"Y",	25
-"1982-12-7",	"2008-6-28",	"M",	306
-"1982-12-7",	"2008-6-28",	"D",	9335
-"1982-12-7",	"2008-6-28",	"YM",	6
-"1982-12-7",	"2008-6-28",	"YD",	203
-"1982-12-7",	"2008-6-28",	"MD",	21
-"2007-12-25",	"2010-3-17",	"Y",	2
-"2007-12-25",	"2010-3-17",	"M",	26
-"2007-12-25",	"2010-3-17",	"D",	813
-"2007-12-25",	"2010-3-17",	"YM",	2
-"2007-12-25",	"2010-3-17",	"YD",	82
-"2007-12-25",	"2010-3-17",	"MD",	20
-"19-12-1960",	"26-01-2012",	"Y",	51
-"19-12-1960",	"26-01-2012",	"M",	613
-"19-12-1960",	"26-01-2012",	"D",	18665
-"19-12-1960",	"26-01-2012",	"YM",	1
-"19-12-1960",	"26-01-2012",	"YD",	38
-"19-12-1960",	"26-01-2012",	"MD",	7
-"19-12-1960",	"12-12-2012",	"Y",	50
+"ABC",		"2007-1-10",	"Y",	"#VALUE!"
+"2007-1-1",	"DEF",		"Y",	"#VALUE!"
+"2007-1-1",	"2007-1-10",	"XYZ",	"#VALUE!"
+"2007-1-10",	"2007-1-1",	"Y",	"#NUM!"
+"2007-12-31",	"2008-1-10",	"Y",	0
+"2007-1-1",	"2007-1-10",	"Y",	0
+"2007-1-1",	"2007-1-10",	"M",	0
+"2007-1-1",	"2007-1-10",	"D",	9
+"2007-1-1",	"2007-1-10",	"YM",	0
+"2007-1-1",	"2007-1-10",	"YD",	9
+"2007-1-1",	"2007-1-10",	"MD",	9
+"2007-1-1",	"2007-12-31",	"Y",	0
+"2007-1-1",	"2007-12-31",	"M",	11
+"2007-1-1",	"2007-12-31",	"D",	364
+"2007-1-1",	"2007-12-31",	"YM",	11
+"2007-1-1",	"2007-12-31",	"YD",	364
+"2007-1-1",	"2007-12-31",	"MD",	30
+"2007-1-1",	"2008-7-1",	"Y",	1
+"2007-1-1",	"2008-7-1",	"M",	18
+"2007-1-1",	"2008-7-1",	"D",	547
+"2007-1-1",	"2008-7-1",	"YM",	6
+"2007-1-1",	"2008-7-1",	"YD",	181
+"2007-1-1",	"2008-7-1",	"MD",	0
+"2007-1-1",	"2007-1-31",	"Y",	0
+"2007-1-1",	"2007-1-31",	"M",	0
+"2007-1-1",	"2007-1-31",	"D",	30
+"2007-1-1",	"2007-1-31",	"YM",	0
+"2007-1-1",	"2007-1-31",	"YD",	30
+"2007-1-1",	"2007-1-31",	"MD",	30
+"2007-1-1",	"2007-2-1",	"Y",	0
+"2007-1-1",	"2007-2-1",	"M",	1
+"2007-1-1",	"2007-2-1",	"D",	31
+"2007-1-1",	"2007-2-1",	"YM",	1
+"2007-1-1",	"2007-2-1",	"YD",	31
+"2007-1-1",	"2007-2-1",	"MD",	0
+"2007-1-1",	"2007-2-28",	"Y",	0
+"2007-1-1",	"2007-2-28",	"M",	1
+"2007-1-1",	"2007-2-28",	"D",	58
+"2007-1-1",	"2007-2-28",	"YM",	1
+"2007-1-1",	"2007-2-28",	"YD",	58
+"2007-1-1",	"2007-2-28",	"MD",	27
+"2007-1-31",	"2007-2-1",	"Y",	0
+"2007-1-31",	"2007-2-1",	"M",	0
+"2007-1-31",	"2007-2-1",	"D",	1
+"2007-1-31",	"2007-2-1",	"YM",	0
+"2007-1-31",	"2007-2-1",	"YD",	1
+"2007-1-31",	"2007-2-1",	"MD",	1
+"2007-1-31",	"2007-3-1",	"Y",	0
+"2007-1-31",	"2007-3-1",	"M",	1
+"2007-1-31",	"2007-3-1",	"D",	29
+"2007-1-31",	"2007-3-1",	"YM",	1
+"2007-1-31",	"2007-3-1",	"YD",	29
+"2007-1-31",	"2007-3-1",	"MD",	-2
+"2007-1-31",	"2007-3-31",	"Y",	0
+"2007-1-31",	"2007-3-31",	"M",	2
+"2007-1-31",	"2007-3-31",	"D",	59
+"2007-1-31",	"2007-3-31",	"YM",	2
+"2007-1-31",	"2007-3-31",	"YD",	59
+"2007-1-31",	"2007-3-31",	"MD",	0
+"2008-1-1",	"2008-9-1",	"Y",	0
+"2008-1-1",	"2008-9-1",	"M",	8
+"2008-1-1",	"2008-9-1",	"D",	244
+"2008-1-1",	"2008-9-1",	"YM",	8
+"2008-1-1",	"2008-9-1",	"YD",	244
+"2008-1-1",	"2008-9-1",	"MD",	0
+"2007-2-1",	"2008-4-1",	"Y",	1
+"2007-2-1",	"2008-4-1",	"M",	14
+"2007-2-1",	"2008-4-1",	"D",	425
+"2007-2-1",	"2008-4-1",	"YM",	2
+"2007-2-1",	"2008-4-1",	"YD",	59
+"2007-2-1",	"2008-4-1",	"MD",	0
+"1960-12-19",	"2008-6-28",	"Y",	47
+"1960-12-19",	"2008-6-28",	"M",	570
+"1960-12-19",	"2008-6-28",	"D",	17358
+"1960-12-19",	"2008-6-28",	"YM",	6
+"1960-12-19",	"2008-6-28",	"YD",	191
+"1960-12-19",	"2008-6-28",	"MD",	9
+"1982-12-7",	"2008-6-28",	"Y",	25
+"1982-12-7",	"2008-6-28",	"M",	306
+"1982-12-7",	"2008-6-28",	"D",	9335
+"1982-12-7",	"2008-6-28",	"YM",	6
+"1982-12-7",	"2008-6-28",	"YD",	203
+"1982-12-7",	"2008-6-28",	"MD",	21
+"2007-12-25",	"2010-3-17",	"Y",	2
+"2007-12-25",	"2010-3-17",	"M",	26
+"2007-12-25",	"2010-3-17",	"D",	813
+"2007-12-25",	"2010-3-17",	"YM",	2
+"2007-12-25",	"2010-3-17",	"YD",	82
+"2007-12-25",	"2010-3-17",	"MD",	20
+"19-12-1960",	"26-01-2012",	"Y",	51
+"19-12-1960",	"26-01-2012",	"M",	613
+"19-12-1960",	"26-01-2012",	"D",	18665
+"19-12-1960",	"26-01-2012",	"YM",	1
+"19-12-1960",	"26-01-2012",	"YD",	38
+"19-12-1960",	"26-01-2012",	"MD",	7
+"19-12-1960",	"12-12-2012",	"Y",	50
diff --git a/unitTests/rawTestData/Calculation/DateTime/DATEVALUE.data b/tests/rawTestData/Calculation/DateTime/DATEVALUE.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/DateTime/DATEVALUE.data
rename to tests/rawTestData/Calculation/DateTime/DATEVALUE.data
index 078e039c..de4960ca 100644
--- a/unitTests/rawTestData/Calculation/DateTime/DATEVALUE.data
+++ b/tests/rawTestData/Calculation/DateTime/DATEVALUE.data
@@ -1,66 +1,66 @@
-# Date String			Result
-"25-Dec-1899",			"#VALUE!"
-"31-Dec-1899",			"#VALUE!"
-"1-Jan-1900",			1
-"1900/2/28",			59
-"29-02-1900",			"#VALUE!"
-"29th February 1900",		"#VALUE!"		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"1900/3/1",			61
-"13-12-1901",			713
-"14-12-1901",			714
-"1903/12/31",			1461
-"1-Jan-1904",			1462
-"2nd-Jan-1904",			1463		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"19-12-1960",			22269
-"1st January 1970",		25569		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"7-Dec-1982",			30292
-"1-1-2008",			39448
-"2038-01-19",			50424
-"2-6-2008",			39601
-"December 25th 2008",		39807		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"1 Jan-2008",			39448
-"12-31-2008",			39813		//	MS Excel success or failure dependent on country settings
-"31-12-2008",			39813		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
-"8/22/2008",			39682		//	MS Excel success or failure dependent on country settings
-"22/8/2008",			39682		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
-"22/8/08",			39682
-"22-AUG-2008",			39682
-"2008/02/23",			39501
-"6-7-2008",			39635
-"28-2-2007",			39141		//	MS Excel success or failure dependent on country settings
-"2-28-2007",			39141		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
-"29-2-2007",			"#VALUE!"	//	Should fail because it's an invalid date, but PHPExcel currently adjusts to 1-3-2007 - FIX NEEDED
-"1/1/1999",			36161
-"1954-07-20",			19925
-"22 August 98",			36029
-"1st March 2007",		39142		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"The 1st day of March 2007",	"#VALUE!"
-"1 Jan",			42370       // 01/01 of the current year
-"31/12",			42735       // 31/12 of the current year
-"12/31",			11658		//	Excel reads as 1st December 1931, not 31st December in current year
-"5-JUL",			42556       // 05/07 of the current year
-"5 Jul",			42556       // 05/07 of the current year
-"12/2008",			39783
-"10/32",			11963
-11,				"#VALUE!"
-TRUE,				"#VALUE!"
-FALSE,				"#VALUE!"
-1,				"#VALUE!"
-12345,				"#VALUE!"
-12,				"#VALUE!"
-"12-Feb-2010",			40221
-"Feb-12-2010",			40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"February-12-2010",		40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"February 12 2010",		40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"18 Feb 2010",			40227
-"17th 3rd 2010",		40254		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"Feb 18th 2010",		40227		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"1st Feb 2010",			40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"1st-Feb-2010",			40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"1me Fev 2010",			"#VALUE!"
-"February 1st 2010",		40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"2nd Feb 2010",			40211		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"Second Feb 2010",		"#VALUE!"
-"First August 2010",		"#VALUE!"
-"1st August 2010",		40391		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
-"15:30:25",			0
+# Date String			Result
+"25-Dec-1899",			"#VALUE!"
+"31-Dec-1899",			"#VALUE!"
+"1-Jan-1900",			1
+"1900/2/28",			59
+"29-02-1900",			"#VALUE!"
+"29th February 1900",		"#VALUE!"		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"1900/3/1",			61
+"13-12-1901",			713
+"14-12-1901",			714
+"1903/12/31",			1461
+"1-Jan-1904",			1462
+"2nd-Jan-1904",			1463		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"19-12-1960",			22269
+"1st January 1970",		25569		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"7-Dec-1982",			30292
+"1-1-2008",			39448
+"2038-01-19",			50424
+"2-6-2008",			39601
+"December 25th 2008",		39807		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"1 Jan-2008",			39448
+"12-31-2008",			39813		//	MS Excel success or failure dependent on country settings
+"31-12-2008",			39813		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
+"8/22/2008",			39682		//	MS Excel success or failure dependent on country settings
+"22/8/2008",			39682		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
+"22/8/08",			39682
+"22-AUG-2008",			39682
+"2008/02/23",			39501
+"6-7-2008",			39635
+"28-2-2007",			39141		//	MS Excel success or failure dependent on country settings
+"2-28-2007",			39141		//		PHPExcel tries to handle both US and UK formats, irrespective of country settings
+"29-2-2007",			"#VALUE!"	//	Should fail because it's an invalid date, but PHPExcel currently adjusts to 1-3-2007 - FIX NEEDED
+"1/1/1999",			36161
+"1954-07-20",			19925
+"22 August 98",			36029
+"1st March 2007",		39142		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"The 1st day of March 2007",	"#VALUE!"
+"1 Jan",			42370       // 01/01 of the current year
+"31/12",			42735       // 31/12 of the current year
+"12/31",			11658		//	Excel reads as 1st December 1931, not 31st December in current year
+"5-JUL",			42556       // 05/07 of the current year
+"5 Jul",			42556       // 05/07 of the current year
+"12/2008",			39783
+"10/32",			11963
+11,				"#VALUE!"
+TRUE,				"#VALUE!"
+FALSE,				"#VALUE!"
+1,				"#VALUE!"
+12345,				"#VALUE!"
+12,				"#VALUE!"
+"12-Feb-2010",			40221
+"Feb-12-2010",			40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"February-12-2010",		40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"February 12 2010",		40221		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"18 Feb 2010",			40227
+"17th 3rd 2010",		40254		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"Feb 18th 2010",		40227		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"1st Feb 2010",			40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"1st-Feb-2010",			40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"1me Fev 2010",			"#VALUE!"
+"February 1st 2010",		40210		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"2nd Feb 2010",			40211		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"Second Feb 2010",		"#VALUE!"
+"First August 2010",		"#VALUE!"
+"1st August 2010",		40391		//	MS Excel will fail with a #VALUE return, but PHPExcel can parse this date
+"15:30:25",			0
diff --git a/unitTests/rawTestData/Calculation/DateTime/DAY.data b/tests/rawTestData/Calculation/DateTime/DAY.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/DateTime/DAY.data
rename to tests/rawTestData/Calculation/DateTime/DAY.data
index e49059c2..bde1e8b5 100644
--- a/unitTests/rawTestData/Calculation/DateTime/DAY.data
+++ b/tests/rawTestData/Calculation/DateTime/DAY.data
@@ -1,8 +1,8 @@
-# Date Value	Result
-22269,		19
-30348,		1
-30843,		10
-"11-Nov-1918",	11
-"28-Feb-1904",	28
-"Invalid",	"#VALUE!"
--1,		"#NUM!"
+# Date Value	Result
+22269,		19
+30348,		1
+30843,		10
+"11-Nov-1918",	11
+"28-Feb-1904",	28
+"Invalid",	"#VALUE!"
+-1,		"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/DAYS360.data b/tests/rawTestData/Calculation/DateTime/DAYS360.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/DateTime/DAYS360.data
rename to tests/rawTestData/Calculation/DateTime/DAYS360.data
index 7f36686a..c7abb612 100644
--- a/unitTests/rawTestData/Calculation/DateTime/DAYS360.data
+++ b/tests/rawTestData/Calculation/DateTime/DAYS360.data
@@ -1,34 +1,34 @@
-"ABC",		"2007-1-10",	FALSE,	"#VALUE!"
-"2007-1-1",	"DEF",		TRUE,	"#VALUE!"
-"2007-1-1",	"2007-1-10",	"XYZ",	"#VALUE!"
-"2007-1-10",	"2007-1-1",	"Y",	"#VALUE!"
-"2007-1-1",	"2007-1-10",	FALSE,	9
-"2007-1-1",	"2007-1-10",	TRUE,	9
-"2007-1-1",	"2007-12-31",	FALSE,	360
-"2007-1-1",	"2007-12-31",	TRUE,	359
-"2007-1-1",	"2008-7-1",	FALSE,	540	
-"2007-1-1",	"2008-7-1",	TRUE,	540	
-"2007-1-1",	"2007-1-31",	FALSE,	30	
-"2007-1-1",	"2007-1-31",	TRUE,	29	
-"2007-1-1",	"2007-2-1",	FALSE,	30	
-"2007-1-1",	"2007-2-1",	TRUE,	30	
-"2007-1-1",	"2007-2-28",	FALSE,	57	
-"2007-1-1",	"2007-2-28",	TRUE,	57	
-"2007-1-31",	"2007-2-1",	FALSE,	1	
-"2007-1-31",	"2007-2-1",	TRUE,	1	
-"2007-1-31",	"2007-3-1",	FALSE,	31	
-"2007-1-31",	"2007-3-1",	TRUE,	31	
-"2007-1-31",	"2007-3-31",	FALSE,	60	
-"2007-1-31",	"2007-3-31",	TRUE,	60	
-"2008-1-1",	"2008-9-1",	FALSE,	240	
-"2008-1-1",	"2008-9-1",	TRUE,	240	
-"2007-2-1",	"2008-4-1",	FALSE,	420	
-"2007-2-1",	"2008-4-1",	TRUE,	420	
-"1960-12-19",	"2008-6-28",	FALSE,	17109
-"1960-12-19",	"2008-6-28",	TRUE,	17109
-"1982-12-7",	"2008-6-28",	FALSE,	9201
-"1982-12-7",	"2008-6-28",	TRUE,	9201
-"2000-2-28",	"2000-3-31",	FALSE,	33
-"2000-2-28",	"2000-3-31",	TRUE,	32
-"2000-2-29",	"2000-3-31",	FALSE,	30
-"2000-2-29",	"2000-3-31",	TRUE,	31
+"ABC",		"2007-1-10",	FALSE,	"#VALUE!"
+"2007-1-1",	"DEF",		TRUE,	"#VALUE!"
+"2007-1-1",	"2007-1-10",	"XYZ",	"#VALUE!"
+"2007-1-10",	"2007-1-1",	"Y",	"#VALUE!"
+"2007-1-1",	"2007-1-10",	FALSE,	9
+"2007-1-1",	"2007-1-10",	TRUE,	9
+"2007-1-1",	"2007-12-31",	FALSE,	360
+"2007-1-1",	"2007-12-31",	TRUE,	359
+"2007-1-1",	"2008-7-1",	FALSE,	540	
+"2007-1-1",	"2008-7-1",	TRUE,	540	
+"2007-1-1",	"2007-1-31",	FALSE,	30	
+"2007-1-1",	"2007-1-31",	TRUE,	29	
+"2007-1-1",	"2007-2-1",	FALSE,	30	
+"2007-1-1",	"2007-2-1",	TRUE,	30	
+"2007-1-1",	"2007-2-28",	FALSE,	57	
+"2007-1-1",	"2007-2-28",	TRUE,	57	
+"2007-1-31",	"2007-2-1",	FALSE,	1	
+"2007-1-31",	"2007-2-1",	TRUE,	1	
+"2007-1-31",	"2007-3-1",	FALSE,	31	
+"2007-1-31",	"2007-3-1",	TRUE,	31	
+"2007-1-31",	"2007-3-31",	FALSE,	60	
+"2007-1-31",	"2007-3-31",	TRUE,	60	
+"2008-1-1",	"2008-9-1",	FALSE,	240	
+"2008-1-1",	"2008-9-1",	TRUE,	240	
+"2007-2-1",	"2008-4-1",	FALSE,	420	
+"2007-2-1",	"2008-4-1",	TRUE,	420	
+"1960-12-19",	"2008-6-28",	FALSE,	17109
+"1960-12-19",	"2008-6-28",	TRUE,	17109
+"1982-12-7",	"2008-6-28",	FALSE,	9201
+"1982-12-7",	"2008-6-28",	TRUE,	9201
+"2000-2-28",	"2000-3-31",	FALSE,	33
+"2000-2-28",	"2000-3-31",	TRUE,	32
+"2000-2-29",	"2000-3-31",	FALSE,	30
+"2000-2-29",	"2000-3-31",	TRUE,	31
diff --git a/unitTests/rawTestData/Calculation/DateTime/EDATE.data b/tests/rawTestData/Calculation/DateTime/EDATE.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/DateTime/EDATE.data
rename to tests/rawTestData/Calculation/DateTime/EDATE.data
index 711c4ed0..b7b13e09 100644
--- a/unitTests/rawTestData/Calculation/DateTime/EDATE.data
+++ b/tests/rawTestData/Calculation/DateTime/EDATE.data
@@ -1,15 +1,15 @@
-"15-Jan-2008",	1,	39493
-"15-Jan-2008",	-1,	39431
-"15-Jan-2008",	2,	39522
-"31-Mar-2007",	1,	39202
-"31-Mar-2007",	-1,	39141
-"31-Mar-2008",	-1,	39507
-"31-Mar-2008",	-4,	39416
-"29-Feb-2008",	-12,	39141
-"15-Mar-2007",	3,	39248
-22269.0,	0,	22269
-22269.0,	2,	22331
-22269.0,	110,	25618
-22269.0,	-110,	18920
-"15-Mar-2007",	"ABC",	"#VALUE!"
-"Invalid",	12,	"#VALUE!"
+"15-Jan-2008",	1,	39493
+"15-Jan-2008",	-1,	39431
+"15-Jan-2008",	2,	39522
+"31-Mar-2007",	1,	39202
+"31-Mar-2007",	-1,	39141
+"31-Mar-2008",	-1,	39507
+"31-Mar-2008",	-4,	39416
+"29-Feb-2008",	-12,	39141
+"15-Mar-2007",	3,	39248
+22269.0,	0,	22269
+22269.0,	2,	22331
+22269.0,	110,	25618
+22269.0,	-110,	18920
+"15-Mar-2007",	"ABC",	"#VALUE!"
+"Invalid",	12,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/EOMONTH.data b/tests/rawTestData/Calculation/DateTime/EOMONTH.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/DateTime/EOMONTH.data
rename to tests/rawTestData/Calculation/DateTime/EOMONTH.data
index 641228c3..130a769c 100644
--- a/unitTests/rawTestData/Calculation/DateTime/EOMONTH.data
+++ b/tests/rawTestData/Calculation/DateTime/EOMONTH.data
@@ -1,17 +1,17 @@
-"15-Jan-2008",	1,	39507
-"15-Jan-2008",	-1,	39447
-"15-Jan-2008",	2,	39538
-"31-Mar-2007",	1,	39202
-"31-Mar-2007",	-1,	39141
-"31-Mar-2008",	-1,	39507
-"31-Mar-2008",	-4,	39416
-"29-Feb-2008",	-12,	39141
-"15-Mar-2007",	3,	39263
-22269.0,	0,	22281
-22269.0,	2,	22340
-22269.0,	110,	25627
-22269.0,	-110,	18932
-22269.0,	3,	22371
-22269.0,	3.75,	22371
-"15-Mar-2007",	"ABC",	"#VALUE!"
-"Invalid",	12,	"#VALUE!"
+"15-Jan-2008",	1,	39507
+"15-Jan-2008",	-1,	39447
+"15-Jan-2008",	2,	39538
+"31-Mar-2007",	1,	39202
+"31-Mar-2007",	-1,	39141
+"31-Mar-2008",	-1,	39507
+"31-Mar-2008",	-4,	39416
+"29-Feb-2008",	-12,	39141
+"15-Mar-2007",	3,	39263
+22269.0,	0,	22281
+22269.0,	2,	22340
+22269.0,	110,	25627
+22269.0,	-110,	18932
+22269.0,	3,	22371
+22269.0,	3.75,	22371
+"15-Mar-2007",	"ABC",	"#VALUE!"
+"Invalid",	12,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/HOUR.data b/tests/rawTestData/Calculation/DateTime/HOUR.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/DateTime/HOUR.data
rename to tests/rawTestData/Calculation/DateTime/HOUR.data
index 52554c1d..94995f5d 100644
--- a/unitTests/rawTestData/Calculation/DateTime/HOUR.data
+++ b/tests/rawTestData/Calculation/DateTime/HOUR.data
@@ -1,12 +1,12 @@
-0.25,			6
-0.75,			18
-0.5,			12
-0.6,			14
-"11-Nov-1918 11:11",	11
-"11:59 PM",		23
-"23:59:59",		23
-3600,			0
--3600,			"#NUM!"
-7200,			0
-65535,			0
-"1 O'Clock",		"#VALUE!"
+0.25,			6
+0.75,			18
+0.5,			12
+0.6,			14
+"11-Nov-1918 11:11",	11
+"11:59 PM",		23
+"23:59:59",		23
+3600,			0
+-3600,			"#NUM!"
+7200,			0
+65535,			0
+"1 O'Clock",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/MINUTE.data b/tests/rawTestData/Calculation/DateTime/MINUTE.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/DateTime/MINUTE.data
rename to tests/rawTestData/Calculation/DateTime/MINUTE.data
index 27c9aaab..6e2374ed 100644
--- a/unitTests/rawTestData/Calculation/DateTime/MINUTE.data
+++ b/tests/rawTestData/Calculation/DateTime/MINUTE.data
@@ -1,12 +1,12 @@
-0.2,			48
-0.4,			36
-0.6,			24
-0.8,			12
-"11-Nov-1918 11:15",	15
-"11:59 PM",		59
-"23:59:59",		59
-3600,			0
--3600,			"#NUM!"
-12500,			0
-65535,			0
-"Half past 1 O'Clock",	"#VALUE!"
+0.2,			48
+0.4,			36
+0.6,			24
+0.8,			12
+"11-Nov-1918 11:15",	15
+"11:59 PM",		59
+"23:59:59",		59
+3600,			0
+-3600,			"#NUM!"
+12500,			0
+65535,			0
+"Half past 1 O'Clock",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/MONTH.data b/tests/rawTestData/Calculation/DateTime/MONTH.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/DateTime/MONTH.data
rename to tests/rawTestData/Calculation/DateTime/MONTH.data
index 3635b956..6336ffda 100644
--- a/unitTests/rawTestData/Calculation/DateTime/MONTH.data
+++ b/tests/rawTestData/Calculation/DateTime/MONTH.data
@@ -1,12 +1,12 @@
-,		1
-0,		1
-22269.0,	12
-30348.0,	2
-30843.0,	6
-"11-Nov-1918",	11
-"28-Feb-1904",	2
-"01 Jul 2003",	7
-38094,		4
-"Dec 2003",	12
--10,		"#NUM!"
-"ABCD",		"#VALUE!"
+,		1
+0,		1
+22269.0,	12
+30348.0,	2
+30843.0,	6
+"11-Nov-1918",	11
+"28-Feb-1904",	2
+"01 Jul 2003",	7
+38094,		4
+"Dec 2003",	12
+-10,		"#NUM!"
+"ABCD",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/NETWORKDAYS.data b/tests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
rename to tests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
index a46a2880..70034bfd 100644
--- a/unitTests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
+++ b/tests/rawTestData/Calculation/DateTime/NETWORKDAYS.data
@@ -1,18 +1,18 @@
-"1-Jan-2007", "10-Jan-2007",							8
-"18-Jun-2008", "20-Jun-2008",							3
-"16-Jun-2008", "20-Jun-2008",							5
-"14-Jun-2008", "20-Jun-2008",							5
-"20-Jun-2008", "20-Jun-2008",							1
-"21-Jun-2008", "21-Jun-2008",							0
-"20-Jun-2008", "20-Jun-2008", "20-Jun-2008",					0
-"20-Jun-2008", "20-Jun-2008", "20-Jun-2008", "20-Jun-2008",			0
-"14-Jun-2008", "25-Jun-2008",							8
-"19-Dec-1960", "10-Jan-1961",							17
-"10-Jan-1961", "19-Dec-1960",							-17
-"19-Dec-1960", "10-Jan-1961", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961",	16
-"10-Jan-1961", "19-Dec-1960", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961",	-16
-"1-Jan-2007", "31-Mar-2007",							65
-"1-Jan-2007", "31-Jan-2007",							23
-"1-Jan-2007", "1-Feb-2007",							24
-"1-Jan-2007", "28-Feb-2007",							43
-"31-Jan-2007", "1-Feb-2007",							2
+"1-Jan-2007", "10-Jan-2007",							8
+"18-Jun-2008", "20-Jun-2008",							3
+"16-Jun-2008", "20-Jun-2008",							5
+"14-Jun-2008", "20-Jun-2008",							5
+"20-Jun-2008", "20-Jun-2008",							1
+"21-Jun-2008", "21-Jun-2008",							0
+"20-Jun-2008", "20-Jun-2008", "20-Jun-2008",					0
+"20-Jun-2008", "20-Jun-2008", "20-Jun-2008", "20-Jun-2008",			0
+"14-Jun-2008", "25-Jun-2008",							8
+"19-Dec-1960", "10-Jan-1961",							17
+"10-Jan-1961", "19-Dec-1960",							-17
+"19-Dec-1960", "10-Jan-1961", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961",	16
+"10-Jan-1961", "19-Dec-1960", "25-Dec-1960", "26-Dec-1960", "01-Jan-1961",	-16
+"1-Jan-2007", "31-Mar-2007",							65
+"1-Jan-2007", "31-Jan-2007",							23
+"1-Jan-2007", "1-Feb-2007",							24
+"1-Jan-2007", "28-Feb-2007",							43
+"31-Jan-2007", "1-Feb-2007",							2
diff --git a/unitTests/rawTestData/Calculation/DateTime/SECOND.data b/tests/rawTestData/Calculation/DateTime/SECOND.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/DateTime/SECOND.data
rename to tests/rawTestData/Calculation/DateTime/SECOND.data
index ab0f2d26..fd883ea1 100644
--- a/unitTests/rawTestData/Calculation/DateTime/SECOND.data
+++ b/tests/rawTestData/Calculation/DateTime/SECOND.data
@@ -1,12 +1,12 @@
-0.2339930556,		57
-0.4202893519,		13
-0.6078935185,		22
-0.8022106481,		11
-"11-Nov-1918 11:15:35",	35
-"11:59 PM",		0
-"23:59:59",		59
-3600,			0
--3601,			"#NUM!"
-12500,			0
-65535,			0
-"Half past 1 O'Clock",	"#VALUE!"
+0.2339930556,		57
+0.4202893519,		13
+0.6078935185,		22
+0.8022106481,		11
+"11-Nov-1918 11:15:35",	35
+"11:59 PM",		0
+"23:59:59",		59
+3600,			0
+-3601,			"#NUM!"
+12500,			0
+65535,			0
+"Half past 1 O'Clock",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/TIME.data b/tests/rawTestData/Calculation/DateTime/TIME.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/DateTime/TIME.data
rename to tests/rawTestData/Calculation/DateTime/TIME.data
index e97d14ac..46d0b9ac 100644
--- a/unitTests/rawTestData/Calculation/DateTime/TIME.data
+++ b/tests/rawTestData/Calculation/DateTime/TIME.data
@@ -1,22 +1,22 @@
-18,	11,	11,	0.757766203704
-6,	15,	5,	0.260474537037
-12,	30,	10,	0.520949074074
-18,	45,	25,	0.781539351852
-15,	32,	50,	0.647800925926
-12,	,	61,	0.500706018519
-11,	,	-1,	0.458321759259
-10,	,	-67,	0.415891203704
-13,	62,	5,	0.584780092593
-9,	-80,	17,	0.319641203704
-8,	-162,	,	0.220833333333
-2,	-120,	-1,	"#NUM!"
-2,	-120,	,	0.000000000000
-2,	-120,	1,	0.000011574074
-36,	1,	2,	0.500717592593
--1,	2,	3,	"#NUM!"
--1,	61,	29,	0.001030092593
--1,	61,	-60,	0.000000000000
-"A",	,	,	"#VALUE!"
-11,	59,	0,	0.499305555556
-12,	0,	0,	0.500000000000
-16,	48,	10,	0.700115740741
+18,	11,	11,	0.757766203704
+6,	15,	5,	0.260474537037
+12,	30,	10,	0.520949074074
+18,	45,	25,	0.781539351852
+15,	32,	50,	0.647800925926
+12,	,	61,	0.500706018519
+11,	,	-1,	0.458321759259
+10,	,	-67,	0.415891203704
+13,	62,	5,	0.584780092593
+9,	-80,	17,	0.319641203704
+8,	-162,	,	0.220833333333
+2,	-120,	-1,	"#NUM!"
+2,	-120,	,	0.000000000000
+2,	-120,	1,	0.000011574074
+36,	1,	2,	0.500717592593
+-1,	2,	3,	"#NUM!"
+-1,	61,	29,	0.001030092593
+-1,	61,	-60,	0.000000000000
+"A",	,	,	"#VALUE!"
+11,	59,	0,	0.499305555556
+12,	0,	0,	0.500000000000
+16,	48,	10,	0.700115740741
diff --git a/unitTests/rawTestData/Calculation/DateTime/TIMEVALUE.data b/tests/rawTestData/Calculation/DateTime/TIMEVALUE.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/DateTime/TIMEVALUE.data
rename to tests/rawTestData/Calculation/DateTime/TIMEVALUE.data
index 1fc4a226..457de24e 100644
--- a/unitTests/rawTestData/Calculation/DateTime/TIMEVALUE.data
+++ b/tests/rawTestData/Calculation/DateTime/TIMEVALUE.data
@@ -1,13 +1,13 @@
-"12:00:00 am",		0
-"12:01:02 am",		0.000717593
-"12:03 pm",		0.502083333
-"12:7:11 pm",		0.504988426
-"4:13:39",		0.176145833
-"6:20:17 pm",		0.764085648
-"18:33:27",		0.773229167
-"31/12/2007 03:27:15",	0.143923611
-"9:44:55 pm",		0.90619213
-12,			"#VALUE!"
-"13:01",		0.542361111
-"33:45",		0.40625
-"13:01PM",		"#VALUE!"
+"12:00:00 am",		0
+"12:01:02 am",		0.000717593
+"12:03 pm",		0.502083333
+"12:7:11 pm",		0.504988426
+"4:13:39",		0.176145833
+"6:20:17 pm",		0.764085648
+"18:33:27",		0.773229167
+"31/12/2007 03:27:15",	0.143923611
+"9:44:55 pm",		0.90619213
+12,			"#VALUE!"
+"13:01",		0.542361111
+"33:45",		0.40625
+"13:01PM",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/WEEKDAY.data b/tests/rawTestData/Calculation/DateTime/WEEKDAY.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/DateTime/WEEKDAY.data
rename to tests/rawTestData/Calculation/DateTime/WEEKDAY.data
index 29159f56..ca2e11f7 100644
--- a/unitTests/rawTestData/Calculation/DateTime/WEEKDAY.data
+++ b/tests/rawTestData/Calculation/DateTime/WEEKDAY.data
@@ -1,27 +1,27 @@
-"24-Oct-1968",		5
-"24-Oct-1968",	2,	4
-"24-Oct-1968",	3,	3
-"2000-06-14",		4
-"2000-06-14",	2,	3
-"2000-06-14",	3,	2
-"1996-07-24",		4
-"1996-07-24",	2,	3
-"1996-07-24",	3,	2
-"1996-07-27",		7
-"1996-07-27",	2,	6
-"1996-07-27",	3,	5
-"1977-7-31",		1
-"1977-7-31",	2,	7
-"1977-7-31",	3,	6
-"1977-8-1",		2
-"1977-8-1",	2,	1
-"1977-8-1",	3,	0
-"1900-2-5",	2,	7
-"1900-2-1",		1
-38093,			6
-38093,		2,	5
-38093,		3,	4
-"3/7/1977",	"A",	"#VALUE!"
-"3/7/1977",	0,	"#NUM!"
-"Invalid",	1,	"#VALUE!"
--1,			"#NUM!"
+"24-Oct-1968",		5
+"24-Oct-1968",	2,	4
+"24-Oct-1968",	3,	3
+"2000-06-14",		4
+"2000-06-14",	2,	3
+"2000-06-14",	3,	2
+"1996-07-24",		4
+"1996-07-24",	2,	3
+"1996-07-24",	3,	2
+"1996-07-27",		7
+"1996-07-27",	2,	6
+"1996-07-27",	3,	5
+"1977-7-31",		1
+"1977-7-31",	2,	7
+"1977-7-31",	3,	6
+"1977-8-1",		2
+"1977-8-1",	2,	1
+"1977-8-1",	3,	0
+"1900-2-5",	2,	7
+"1900-2-1",		1
+38093,			6
+38093,		2,	5
+38093,		3,	4
+"3/7/1977",	"A",	"#VALUE!"
+"3/7/1977",	0,	"#NUM!"
+"Invalid",	1,	"#VALUE!"
+-1,			"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/WEEKNUM.data b/tests/rawTestData/Calculation/DateTime/WEEKNUM.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/DateTime/WEEKNUM.data
rename to tests/rawTestData/Calculation/DateTime/WEEKNUM.data
index c0011887..22a01a74 100644
--- a/unitTests/rawTestData/Calculation/DateTime/WEEKNUM.data
+++ b/tests/rawTestData/Calculation/DateTime/WEEKNUM.data
@@ -1,7 +1,7 @@
-"21-Dec-2000",	1,	52
-"1995-01-01",	1,	1
-"3/7/1977",		27
-"3/7/1977",	"A",	"#VALUE!"
-"3/7/1977",	0,	"#NUM!"
-"Invalid",	1,	"#VALUE!"
--1,			"#NUM!"
+"21-Dec-2000",	1,	52
+"1995-01-01",	1,	1
+"3/7/1977",		27
+"3/7/1977",	"A",	"#VALUE!"
+"3/7/1977",	0,	"#NUM!"
+"Invalid",	1,	"#VALUE!"
+-1,			"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/WORKDAY.data b/tests/rawTestData/Calculation/DateTime/WORKDAY.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/DateTime/WORKDAY.data
rename to tests/rawTestData/Calculation/DateTime/WORKDAY.data
index b1443380..1070898b 100644
--- a/unitTests/rawTestData/Calculation/DateTime/WORKDAY.data
+++ b/tests/rawTestData/Calculation/DateTime/WORKDAY.data
@@ -1,13 +1,13 @@
-"1-Jan-2007",	"ABC",	"#VALUE!"
-"1-Jan-2007",	9,	39094
-"18-Jun-2008",	2,	39619
-"16-Jun-2008",	4,	39619
-"14-Jun-2008",	6,	39622
-"14-Jun-2008",	11,	39629
-"14-Jun-2008",	-2,	39611
-"14-Jun-2008",	-6,	39605
-"19-Dec-2008",	10,	39815
-"19-Dec-2008",	10,	"25-Dec-2008",	"26-Dec-2008",	"01-Jan-2009",	39820
-"19-Dec-2008",	10,	{"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"},	39820
-39820,		-10,	{"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"},	39801
-"5-Apr-2012",	3,	{"6-Apr-2012"|"9-Apr-2012"},			41010
+"1-Jan-2007",	"ABC",	"#VALUE!"
+"1-Jan-2007",	9,	39094
+"18-Jun-2008",	2,	39619
+"16-Jun-2008",	4,	39619
+"14-Jun-2008",	6,	39622
+"14-Jun-2008",	11,	39629
+"14-Jun-2008",	-2,	39611
+"14-Jun-2008",	-6,	39605
+"19-Dec-2008",	10,	39815
+"19-Dec-2008",	10,	"25-Dec-2008",	"26-Dec-2008",	"01-Jan-2009",	39820
+"19-Dec-2008",	10,	{"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"},	39820
+39820,		-10,	{"25-Dec-2008"|"26-Dec-2008"|"01-Jan-2009"},	39801
+"5-Apr-2012",	3,	{"6-Apr-2012"|"9-Apr-2012"},			41010
diff --git a/unitTests/rawTestData/Calculation/DateTime/YEAR.data b/tests/rawTestData/Calculation/DateTime/YEAR.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/DateTime/YEAR.data
rename to tests/rawTestData/Calculation/DateTime/YEAR.data
index 5bbbae04..fe35f1b4 100644
--- a/unitTests/rawTestData/Calculation/DateTime/YEAR.data
+++ b/tests/rawTestData/Calculation/DateTime/YEAR.data
@@ -1,11 +1,11 @@
-,		1900
-1,		1900
-33333.33,	1991
-22269.0,	1960
-30348.0,	1983
-30843.0,	1984
-"01 Jan 2525",	2525
-"11-Nov-1918",	1918
-"28-Feb-1904",	1904
--10,		"#NUM!"
-"ABCD",		"#VALUE!"
+,		1900
+1,		1900
+33333.33,	1991
+22269.0,	1960
+30348.0,	1983
+30843.0,	1984
+"01 Jan 2525",	2525
+"11-Nov-1918",	1918
+"28-Feb-1904",	1904
+-10,		"#NUM!"
+"ABCD",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/DateTime/YEARFRAC.data b/tests/rawTestData/Calculation/DateTime/YEARFRAC.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/DateTime/YEARFRAC.data
rename to tests/rawTestData/Calculation/DateTime/YEARFRAC.data
index c56804da..3fc58277 100644
--- a/unitTests/rawTestData/Calculation/DateTime/YEARFRAC.data
+++ b/tests/rawTestData/Calculation/DateTime/YEARFRAC.data
@@ -1,65 +1,65 @@
-"2007-1-1",	"2007-1-10",	0,	0.025
-"2007-1-1",	"2007-1-10",	1,	0.02465753424658
-"2007-1-1",	"2007-1-10",	2,	0.025
-"2007-1-1",	"2007-1-10",	3,	0.02465753424658
-"2007-1-1",	"2007-1-10",	4,	0.025
-"2007-1-1",	"2007-12-31",	0,	1.0
-"2007-1-1",	"2007-12-31",	1,	0.99726027397260
-"2007-1-1",	"2007-12-31",	2,	1.01111111111111
-"2007-1-1",	"2007-12-31",	3,	0.99726027397260
-"2007-1-1",	"2007-12-31",	4,	0.99722222222222
-"2007-1-1",	"2008-7-1",	0,	1.5
-"2007-1-1",	"2008-7-1",	1,	1.49658002735978
-"2007-1-1",	"2008-7-1",	2,	1.51944444444444
-"2007-1-1",	"2008-7-1",	3,	1.49863013698630
-"2007-1-1",	"2008-7-1",	4,	1.5
-"2007-1-1",	"2007-1-31",	0,	0.08333333333333
-"2007-1-1",	"2007-1-31",	1,	0.08219178082192
-"2007-1-1",	"2007-1-31",	2,	0.08333333333333
-"2007-1-1",	"2007-1-31",	3,	0.08219178082192
-"2007-1-1",	"2007-1-31",	4,	0.08055555555556
-"2007-1-1",	"2007-2-1",	0,	0.08333333333333
-"2007-1-1",	"2007-2-1",	1,	0.08493150684932
-"2007-1-1",	"2007-2-1",	2,	0.08611111111111
-"2007-1-1",	"2007-2-1",	3,	0.08493150684932
-"2007-1-1",	"2007-2-1",	4,	0.08333333333333
-"2007-1-1",	"2007-2-28",	0,	0.15833333333333
-"2007-1-1",	"2007-2-28",	1,	0.15890410958904
-"2007-1-1",	"2007-2-28",	2,	0.16111111111111
-"2007-1-1",	"2007-2-28",	3,	0.15890410958904
-"2007-1-1",	"2007-2-28",	4,	0.15833333333333
-"2007-1-31",	"2007-2-1",	0,	0.00277777777778
-"2007-1-31",	"2007-2-1",	1,	0.00273972602740
-"2007-1-31",	"2007-2-1",	2,	0.00277777777778
-"2007-1-31",	"2007-2-1",	3,	0.00273972602740
-"2007-1-31",	"2007-2-1",	4,	0.00277777777778
-"2007-1-31",	"2007-3-1",	0,	0.08611111111111
-"2007-1-31",	"2007-3-1",	1,	0.07945205479452
-"2007-1-31",	"2007-3-1",	2,	0.08055555555556
-"2007-1-31",	"2007-3-1",	3,	0.07945205479452
-"2007-1-31",	"2007-3-1",	4,	0.08611111111111
-"2007-1-31",	"2007-3-31",	0,	0.16666666666667
-"2007-1-31",	"2007-3-31",	1,	0.16164383561644
-"2007-1-31",	"2007-3-31",	2,	0.16388888888889
-"2007-1-31",	"2007-3-31",	3,	0.16164383561644
-"2007-1-31",	"2007-3-31",	4,	0.16666666666667
-"2008-1-1",	"2008-9-1",	0,	0.66666666666667
-"2008-1-1",	"2008-9-1",	1,	0.66666666666667
-"2008-1-1",	"2008-9-1",	2,	0.67777777777778
-"2008-1-1",	"2008-9-1",	3,	0.66849315068493
-"2008-1-1",	"2008-9-1",	4,	0.66666666666667
-"2007-2-1",	"2008-4-1",	0,	1.16666666666667
-"2007-2-1",	"2008-4-1",	1,	1.16279069767442
-"2007-2-1",	"2008-4-1",	2,	1.18055555555556
-"2007-2-1",	"2008-4-1",	3,	1.16438356164384
-"2007-2-1",	"2008-4-1",	4,	1.16666666666667
-"1960-12-19",	"2008-6-28",	0,	47.525
-"1960-12-19",	"2008-6-28",	1,	47.52162252765670
-"1960-12-19",	"2008-6-28",	2,	48.21666666666670
-"1960-12-19",	"2008-6-28",	3,	47.55616438356160
-"1960-12-19",	"2008-6-28",	4,	47.525
-"1982-12-7",	"2008-6-28",	0,	25.55833333333330
-"1982-12-7",	"2008-6-28",	1,	25.55718921111340
-"1982-12-7",	"2008-6-28",	2,	25.93055555555560
-"1982-12-7",	"2008-6-28",	3,	25.57534246575340
-"1982-12-7",	"2008-6-28",	4,	25.55833333333330
+"2007-1-1",	"2007-1-10",	0,	0.025
+"2007-1-1",	"2007-1-10",	1,	0.02465753424658
+"2007-1-1",	"2007-1-10",	2,	0.025
+"2007-1-1",	"2007-1-10",	3,	0.02465753424658
+"2007-1-1",	"2007-1-10",	4,	0.025
+"2007-1-1",	"2007-12-31",	0,	1.0
+"2007-1-1",	"2007-12-31",	1,	0.99726027397260
+"2007-1-1",	"2007-12-31",	2,	1.01111111111111
+"2007-1-1",	"2007-12-31",	3,	0.99726027397260
+"2007-1-1",	"2007-12-31",	4,	0.99722222222222
+"2007-1-1",	"2008-7-1",	0,	1.5
+"2007-1-1",	"2008-7-1",	1,	1.49658002735978
+"2007-1-1",	"2008-7-1",	2,	1.51944444444444
+"2007-1-1",	"2008-7-1",	3,	1.49863013698630
+"2007-1-1",	"2008-7-1",	4,	1.5
+"2007-1-1",	"2007-1-31",	0,	0.08333333333333
+"2007-1-1",	"2007-1-31",	1,	0.08219178082192
+"2007-1-1",	"2007-1-31",	2,	0.08333333333333
+"2007-1-1",	"2007-1-31",	3,	0.08219178082192
+"2007-1-1",	"2007-1-31",	4,	0.08055555555556
+"2007-1-1",	"2007-2-1",	0,	0.08333333333333
+"2007-1-1",	"2007-2-1",	1,	0.08493150684932
+"2007-1-1",	"2007-2-1",	2,	0.08611111111111
+"2007-1-1",	"2007-2-1",	3,	0.08493150684932
+"2007-1-1",	"2007-2-1",	4,	0.08333333333333
+"2007-1-1",	"2007-2-28",	0,	0.15833333333333
+"2007-1-1",	"2007-2-28",	1,	0.15890410958904
+"2007-1-1",	"2007-2-28",	2,	0.16111111111111
+"2007-1-1",	"2007-2-28",	3,	0.15890410958904
+"2007-1-1",	"2007-2-28",	4,	0.15833333333333
+"2007-1-31",	"2007-2-1",	0,	0.00277777777778
+"2007-1-31",	"2007-2-1",	1,	0.00273972602740
+"2007-1-31",	"2007-2-1",	2,	0.00277777777778
+"2007-1-31",	"2007-2-1",	3,	0.00273972602740
+"2007-1-31",	"2007-2-1",	4,	0.00277777777778
+"2007-1-31",	"2007-3-1",	0,	0.08611111111111
+"2007-1-31",	"2007-3-1",	1,	0.07945205479452
+"2007-1-31",	"2007-3-1",	2,	0.08055555555556
+"2007-1-31",	"2007-3-1",	3,	0.07945205479452
+"2007-1-31",	"2007-3-1",	4,	0.08611111111111
+"2007-1-31",	"2007-3-31",	0,	0.16666666666667
+"2007-1-31",	"2007-3-31",	1,	0.16164383561644
+"2007-1-31",	"2007-3-31",	2,	0.16388888888889
+"2007-1-31",	"2007-3-31",	3,	0.16164383561644
+"2007-1-31",	"2007-3-31",	4,	0.16666666666667
+"2008-1-1",	"2008-9-1",	0,	0.66666666666667
+"2008-1-1",	"2008-9-1",	1,	0.66666666666667
+"2008-1-1",	"2008-9-1",	2,	0.67777777777778
+"2008-1-1",	"2008-9-1",	3,	0.66849315068493
+"2008-1-1",	"2008-9-1",	4,	0.66666666666667
+"2007-2-1",	"2008-4-1",	0,	1.16666666666667
+"2007-2-1",	"2008-4-1",	1,	1.16279069767442
+"2007-2-1",	"2008-4-1",	2,	1.18055555555556
+"2007-2-1",	"2008-4-1",	3,	1.16438356164384
+"2007-2-1",	"2008-4-1",	4,	1.16666666666667
+"1960-12-19",	"2008-6-28",	0,	47.525
+"1960-12-19",	"2008-6-28",	1,	47.52162252765670
+"1960-12-19",	"2008-6-28",	2,	48.21666666666670
+"1960-12-19",	"2008-6-28",	3,	47.55616438356160
+"1960-12-19",	"2008-6-28",	4,	47.525
+"1982-12-7",	"2008-6-28",	0,	25.55833333333330
+"1982-12-7",	"2008-6-28",	1,	25.55718921111340
+"1982-12-7",	"2008-6-28",	2,	25.93055555555560
+"1982-12-7",	"2008-6-28",	3,	25.57534246575340
+"1982-12-7",	"2008-6-28",	4,	25.55833333333330
diff --git a/unitTests/rawTestData/Calculation/Engineering/BESSELI.data b/tests/rawTestData/Calculation/Engineering/BESSELI.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/Engineering/BESSELI.data
rename to tests/rawTestData/Calculation/Engineering/BESSELI.data
diff --git a/unitTests/rawTestData/Calculation/Engineering/BESSELJ.data b/tests/rawTestData/Calculation/Engineering/BESSELJ.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/Engineering/BESSELJ.data
rename to tests/rawTestData/Calculation/Engineering/BESSELJ.data
diff --git a/unitTests/rawTestData/Calculation/Engineering/BESSELK.data b/tests/rawTestData/Calculation/Engineering/BESSELK.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/Engineering/BESSELK.data
rename to tests/rawTestData/Calculation/Engineering/BESSELK.data
diff --git a/unitTests/rawTestData/Calculation/Engineering/BESSELY.data b/tests/rawTestData/Calculation/Engineering/BESSELY.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/Engineering/BESSELY.data
rename to tests/rawTestData/Calculation/Engineering/BESSELY.data
diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data b/tests/rawTestData/Calculation/Engineering/BIN2DEC.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data
rename to tests/rawTestData/Calculation/Engineering/BIN2DEC.data
index 74f9159b..04365fca 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2DEC.data
+++ b/tests/rawTestData/Calculation/Engineering/BIN2DEC.data
@@ -1,10 +1,10 @@
-"10110010",	"178"
-"1100100",	"100"
-"111001010101",	"#NUM!"		//	Too large
-"101",		"5"
-"10",		"2"
-"0",		"0"
-"21",		"#NUM!"		//	Invalid binary number
-TRUE,		"#VALUE!"	//	Non string
-"1110010101",	"-107"		//	2's Complement
-"1111111111",	"-1"		//	2's Complement
+"10110010",	"178"
+"1100100",	"100"
+"111001010101",	"#NUM!"		//	Too large
+"101",		"5"
+"10",		"2"
+"0",		"0"
+"21",		"#NUM!"		//	Invalid binary number
+TRUE,		"#VALUE!"	//	Non string
+"1110010101",	"-107"		//	2's Complement
+"1111111111",	"-1"		//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data b/tests/rawTestData/Calculation/Engineering/BIN2HEX.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data
rename to tests/rawTestData/Calculation/Engineering/BIN2HEX.data
index 13af46ff..7f7198e6 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2HEX.data
+++ b/tests/rawTestData/Calculation/Engineering/BIN2HEX.data
@@ -1,14 +1,14 @@
-"10110010",		"B2"
-"111001010101",		"#NUM!"		//	Too large
-"11111011",	4,	"00FB"		//	Leading places
-"11111011",	3.75,	"0FB"		//	Leading places as a float
-"11111011",	-1,	"#NUM!"		//	Leading places negative
-"11111011",	"ABC",	"#VALUE!"	//	Leading places non-numeric
-"1110",			"E"
-"101",			"5"
-"10",			"2"
-"0",			"0"
-"21",			"#NUM!"		//	Invalid binary number
-TRUE,			"#VALUE!"	//	Non string
-"1110010101",		"FFFFFFFF95"	//	2's Complement
-"1111111111",		"FFFFFFFFFF"	//	2's Complement
+"10110010",		"B2"
+"111001010101",		"#NUM!"		//	Too large
+"11111011",	4,	"00FB"		//	Leading places
+"11111011",	3.75,	"0FB"		//	Leading places as a float
+"11111011",	-1,	"#NUM!"		//	Leading places negative
+"11111011",	"ABC",	"#VALUE!"	//	Leading places non-numeric
+"1110",			"E"
+"101",			"5"
+"10",			"2"
+"0",			"0"
+"21",			"#NUM!"		//	Invalid binary number
+TRUE,			"#VALUE!"	//	Non string
+"1110010101",		"FFFFFFFF95"	//	2's Complement
+"1111111111",		"FFFFFFFFFF"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data b/tests/rawTestData/Calculation/Engineering/BIN2OCT.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data
rename to tests/rawTestData/Calculation/Engineering/BIN2OCT.data
index fa1f5d5b..3971654b 100644
--- a/unitTests/rawTestData/Calculation/Engineering/BIN2OCT.data
+++ b/tests/rawTestData/Calculation/Engineering/BIN2OCT.data
@@ -1,15 +1,15 @@
-"1100100",		"144"
-"10110010",		"262"
-"111001010101",		"#NUM!"		//	Too large
-"1001",		3,	"011"		//	Leading places
-"1001",		4.75,	"0011"		//	Leading places as a float
-"1001",		-1,	"#NUM!"		//	Leading places negative
-"1001",		"ABC",	"#VALUE!"	//	Leading places non-numeric
-"00000010",		"2"
-"00000101",		"5"
-"00001101",		"15"
-"0",			"0"
-"21",			"#NUM!"		//	Invalid binary number
-TRUE,			"#VALUE!"	//	Non string
-"1110010101",		"7777777625"	//	2's Complement
-"1111111111",		"7777777777"	//	2's Complement
+"1100100",		"144"
+"10110010",		"262"
+"111001010101",		"#NUM!"		//	Too large
+"1001",		3,	"011"		//	Leading places
+"1001",		4.75,	"0011"		//	Leading places as a float
+"1001",		-1,	"#NUM!"		//	Leading places negative
+"1001",		"ABC",	"#VALUE!"	//	Leading places non-numeric
+"00000010",		"2"
+"00000101",		"5"
+"00001101",		"15"
+"0",			"0"
+"21",			"#NUM!"		//	Invalid binary number
+TRUE,			"#VALUE!"	//	Non string
+"1110010101",		"7777777625"	//	2's Complement
+"1111111111",		"7777777777"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/COMPLEX.data b/tests/rawTestData/Calculation/Engineering/COMPLEX.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/COMPLEX.data
rename to tests/rawTestData/Calculation/Engineering/COMPLEX.data
index a1883443..980b53bf 100644
--- a/unitTests/rawTestData/Calculation/Engineering/COMPLEX.data
+++ b/tests/rawTestData/Calculation/Engineering/COMPLEX.data
@@ -1,547 +1,547 @@
-3,		4,		"3+4i"
-3,		4,	"j",	"3+4j"
-12.34,		5.67,	"j",	"12.34+5.67j"
-3.5,		"A",		"#VALUE!"
-1.234E-5,	6.78E9,		"1.234E-5+6780000000i"
-1.234E5,	6.78E-9,	"123400+6.78E-9i"
-3.5,		2.5,		"3.5+2.5i"
-3.5,		1,		"3.5+i"
-3.5,		0,		3.5
-3.5,		-1,		"3.5-i"
-3.5,		-2.5,		"3.5-2.5i"
-1,		2.5,		"1+2.5i"
-1,		1,		"1+i"
-1,		0,		1
-1,		-1,		"1-i"
-1,		-2.5,		"1-2.5i"
-0,		2.5,		"2.5i"
-0,		1,		"i"
-0,		0,		0
-0,		-1,		"-i"
-0,		-2.5,		"-2.5i"
--1,		2.5,		"-1+2.5i"
--1,		1,		"-1+i"
--1,		0,		-1
--1,		-1,		"-1-i"
--1,		-2.5,		"-1-2.5i"
--3.5,		2.5,		"-3.5+2.5i"
--3.5,		1,		"-3.5+i"
--3.5,		0,		"-3.5"
--3.5,		-1,		"-3.5-i"
--3.5,		-2.5,		"-3.5-2.5i"
--2.5,		-2.5,		"-2.5-2.5i"
--2.5,		-2.5,		"-2.5-2.5i"
--1.5,		-2.5,		"-1.5-2.5i"
--1.5,		-2.5,		"-1.5-2.5i"
--0.5,		-2.5,		"-0.5-2.5i"
-0,		-2.5,		"-2.5i"
-0.5,		-2.5,		"0.5-2.5i"
-1,		-2.5,		"1-2.5i"
-1.5,		-2.5,		"1.5-2.5i"
-2,		-2.5,		"2-2.5i"
-2.5,		-2.5,		"2.5-2.5i"
-3,		-2.5,		"3-2.5i"
-3.5,		-2.5,		"3.5-2.5i"
--2.5,		-2.5,		"-2.5-2.5i"
--2.5,		-2.5,		"-2.5-2.5i"
--1.5,		-2.5,		"-1.5-2.5i"
--1.5,		-2.5,		"-1.5-2.5i"
--0.5,		-2.5,		"-0.5-2.5i"
-0,		-2.5,		"-2.5i"
-0.5,		-2.5,		"0.5-2.5i"
-1,		-2.5,		"1-2.5i"
-1.5,		-2.5,		"1.5-2.5i"
-2,		-2.5,		"2-2.5i"
-2.5,		-2.5,		"2.5-2.5i"
-3,		-2.5,		"3-2.5i"
-3.5,		-2.5,		"3.5-2.5i"
--2.5,		-1.5,		"-2.5-1.5i"
--2.5,		-1.5,		"-2.5-1.5i"
--1.5,		-1.5,		"-1.5-1.5i"
--1.5,		-1.5,		"-1.5-1.5i"
--0.5,		-1.5,		"-0.5-1.5i"
-0,		-1.5,		"-1.5i"
-0.5,		-1.5,		"0.5-1.5i"
-1,		-1.5,		"1-1.5i"
-1.5,		-1.5,		"1.5-1.5i"
-2,		-1.5,		"2-1.5i"
-2.5,		-1.5,		"2.5-1.5i"
-3,		-1.5,		"3-1.5i"
-3.5,		-1.5,		"3.5-1.5i"
--2.5,		-1.5,		"-2.5-1.5i"
--2.5,		-1.5,		"-2.5-1.5i"
--1.5,		-1.5,		"-1.5-1.5i"
--1.5,		-1.5,		"-1.5-1.5i"
--0.5,		-1.5,		"-0.5-1.5i"
-0,		-1.5,		"-1.5i"
-0.5,		-1.5,		"0.5-1.5i"
-1,		-1.5,		"1-1.5i"
-1.5,		-1.5,		"1.5-1.5i"
-2,		-1.5,		"2-1.5i"
-2.5,		-1.5,		"2.5-1.5i"
-3,		-1.5,		"3-1.5i"
-3.5,		-1.5,		"3.5-1.5i"
--2.5,		-0.5,		"-2.5-0.5i"
--2.5,		-0.5,		"-2.5-0.5i"
--1.5,		-0.5,		"-1.5-0.5i"
--1.5,		-0.5,		"-1.5-0.5i"
--0.5,		-0.5,		"-0.5-0.5i"
-0,		-0.5,		"-0.5i"
-0.5,		-0.5,		"0.5-0.5i"
-1,		-0.5,		"1-0.5i"
-1.5,		-0.5,		"1.5-0.5i"
-2,		-0.5,		"2-0.5i"
-2.5,		-0.5,		"2.5-0.5i"
-3,		-0.5,		"3-0.5i"
-3.5,		-0.5,		"3.5-0.5i"
--2.5,		0,		-2.5
--2.5,		0,		-2.5
--1.5,		0,		-1.5
--1.5,		0,		-1.5
--0.5,		0,		-0.5
-0,		0,		0
-0.5,		0,		0.5
-1,		0,		1
-1.5,		0,		1.5
-2,		0,		2
-2.5,		0,		2.5
-3,		0,		3
-3.5,		0,		3.5
--2.5,		0.5,		"-2.5+0.5i"
--2.5,		0.5,		"-2.5+0.5i"
--1.5,		0.5,		"-1.5+0.5i"
--1.5,		0.5,		"-1.5+0.5i"
--0.5,		0.5,		"-0.5+0.5i"
-0,		0.5,		"0.5i"
-0.5,		0.5,		"0.5+0.5i"
-1,		0.5,		"1+0.5i"
-1.5,		0.5,		"1.5+0.5i"
-2,		0.5,		"2+0.5i"
-2.5,		0.5,		"2.5+0.5i"
-3,		0.5,		"3+0.5i"
-3.5,		0.5,		"3.5+0.5i"
--2.5,		1,		"-2.5+i"
--2.5,		1,		"-2.5+i"
--1.5,		1,		"-1.5+i"
--1.5,		1,		"-1.5+i"
--0.5,		1,		"-0.5+i"
-0,		1,		"i"
-0.5,		1,		"0.5+i"
-1,		1,		"1+i"
-1.5,		1,		"1.5+i"
-2,		1,		"2+i"
-2.5,		1,		"2.5+i"
-3,		1,		"3+i"
-3.5,		1,		"3.5+i"
--2.5,		1.5,		"-2.5+1.5i"
--2.5,		1.5,		"-2.5+1.5i"
--1.5,		1.5,		"-1.5+1.5i"
--1.5,		1.5,		"-1.5+1.5i"
--0.5,		1.5,		"-0.5+1.5i"
-0,		1.5,		"1.5i"
-0.5,		1.5,		"0.5+1.5i"
-1,		1.5,		"1+1.5i"
-1.5,		1.5,		"1.5+1.5i"
-2,		1.5,		"2+1.5i"
-2.5,		1.5,		"2.5+1.5i"
-3,		1.5,		"3+1.5i"
-3.5,		1.5,		"3.5+1.5i"
--2.5,		2,		"-2.5+2i"
--2.5,		2,		"-2.5+2i"
--1.5,		2,		"-1.5+2i"
--1.5,		2,		"-1.5+2i"
--0.5,		2,		"-0.5+2i"
-0,		2,		"2i"
-0.5,		2,		"0.5+2i"
-1,		2,		"1+2i"
-1.5,		2,		"1.5+2i"
-2,		2,		"2+2i"
-2.5,		2,		"2.5+2i"
-3,		2,		"3+2i"
-3.5,		2,		"3.5+2i"
--2.5,		2.5,		"-2.5+2.5i"
--2.5,		2.5,		"-2.5+2.5i"
--1.5,		2.5,		"-1.5+2.5i"
--1.5,		2.5,		"-1.5+2.5i"
--0.5,		2.5,		"-0.5+2.5i"
-0,		2.5,		"2.5i"
-0.5,		2.5,		"0.5+2.5i"
-1,		2.5,		"1+2.5i"
-1.5,		2.5,		"1.5+2.5i"
-2,		2.5,		"2+2.5i"
-2.5,		2.5,		"2.5+2.5i"
-3,		2.5,		"3+2.5i"
-3.5,		2.5,		"3.5+2.5i"
--2.5,		3,		"-2.5+3i"
--2.5,		3,		"-2.5+3i"
--1.5,		3,		"-1.5+3i"
--1.5,		3,		"-1.5+3i"
--0.5,		3,		"-0.5+3i"
-0,		3,		"3i"
-0.5,		3,		"0.5+3i"
-1,		3,		"1+3i"
-1.5,		3,		"1.5+3i"
-2,		3,		"2+3i"
-2.5,		3,		"2.5+3i"
-3,		3,		"3+3i"
-3.5,		3,		"3.5+3i"
--2.5,		3.5,		"-2.5+3.5i"
--2.5,		3.5,		"-2.5+3.5i"
--1.5,		3.5,		"-1.5+3.5i"
--1.5,		3.5,		"-1.5+3.5i"
--0.5,		3.5,		"-0.5+3.5i"
-0,		3.5,		"3.5i"
-0.5,		3.5,		"0.5+3.5i"
-1,		3.5,		"1+3.5i"
-1.5,		3.5,		"1.5+3.5i"
-2,		3.5,		"2+3.5i"
-2.5,		3.5,		"2.5+3.5i"
-3,		3.5,		"3+3.5i"
-3.5,		3.5,		"3.5+3.5i"
--2.5,		-2.5,	"i",	"-2.5-2.5i"
--2.5,		-2.5,	"i",	"-2.5-2.5i"
--1.5,		-2.5,	"i",	"-1.5-2.5i"
--1.5,		-2.5,	"i",	"-1.5-2.5i"
--0.5,		-2.5,	"i",	"-0.5-2.5i"
-0,		-2.5,	"i",	"-2.5i"
-0.5,		-2.5,	"i",	"0.5-2.5i"
-1,		-2.5,	"i",	"1-2.5i"
-1.5,		-2.5,	"i",	"1.5-2.5i"
-2,		-2.5,	"i",	"2-2.5i"
-2.5,		-2.5,	"i",	"2.5-2.5i"
-3,		-2.5,	"i",	"3-2.5i"
-3.5,		-2.5,	"i",	"3.5-2.5i"
--2.5,		-2.5,	"i",	"-2.5-2.5i"
--2.5,		-2.5,	"i",	"-2.5-2.5i"
--1.5,		-2.5,	"i",	"-1.5-2.5i"
--1.5,		-2.5,	"i",	"-1.5-2.5i"
--0.5,		-2.5,	"i",	"-0.5-2.5i"
-0,		-2.5,	"i",	"-2.5i"
-0.5,		-2.5,	"i",	"0.5-2.5i"
-1,		-2.5,	"i",	"1-2.5i"
-1.5,		-2.5,	"i",	"1.5-2.5i"
-2,		-2.5,	"i",	"2-2.5i"
-2.5,		-2.5,	"i",	"2.5-2.5i"
-3,		-2.5,	"i",	"3-2.5i"
-3.5,		-2.5,	"i",	"3.5-2.5i"
--2.5,		-1.5,	"i",	"-2.5-1.5i"
--2.5,		-1.5,	"i",	"-2.5-1.5i"
--1.5,		-1.5,	"i",	"-1.5-1.5i"
--1.5,		-1.5,	"i",	"-1.5-1.5i"
--0.5,		-1.5,	"i",	"-0.5-1.5i"
-0,		-1.5,	"i",	"-1.5i"
-0.5,		-1.5,	"i",	"0.5-1.5i"
-1,		-1.5,	"i",	"1-1.5i"
-1.5,		-1.5,	"i",	"1.5-1.5i"
-2,		-1.5,	"i",	"2-1.5i"
-2.5,		-1.5,	"i",	"2.5-1.5i"
-3,		-1.5,	"i",	"3-1.5i"
-3.5,		-1.5,	"i",	"3.5-1.5i"
--2.5,		-1.5,	"i",	"-2.5-1.5i"
--2.5,		-1.5,	"i",	"-2.5-1.5i"
--1.5,		-1.5,	"i",	"-1.5-1.5i"
--1.5,		-1.5,	"i",	"-1.5-1.5i"
--0.5,		-1.5,	"i",	"-0.5-1.5i"
-0,		-1.5,	"i",	"-1.5i"
-0.5,		-1.5,	"i",	"0.5-1.5i"
-1,		-1.5,	"i",	"1-1.5i"
-1.5,		-1.5,	"i",	"1.5-1.5i"
-2,		-1.5,	"i",	"2-1.5i"
-2.5,		-1.5,	"i",	"2.5-1.5i"
-3,		-1.5,	"i",	"3-1.5i"
-3.5,		-1.5,	"i",	"3.5-1.5i"
--2.5,		-0.5,	"i",	"-2.5-0.5i"
--2.5,		-0.5,	"i",	"-2.5-0.5i"
--1.5,		-0.5,	"i",	"-1.5-0.5i"
--1.5,		-0.5,	"i",	"-1.5-0.5i"
--0.5,		-0.5,	"i",	"-0.5-0.5i"
-0,		-0.5,	"i",	"-0.5i"
-0.5,		-0.5,	"i",	"0.5-0.5i"
-1,		-0.5,	"i",	"1-0.5i"
-1.5,		-0.5,	"i",	"1.5-0.5i"
-2,		-0.5,	"i",	"2-0.5i"
-2.5,		-0.5,	"i",	"2.5-0.5i"
-3,		-0.5,	"i",	"3-0.5i"
-3.5,		-0.5,	"i",	"3.5-0.5i"
--2.5,		0,	"i",	-2.5
--2.5,		0,	"i",	-2.5
--1.5,		0,	"i",	-1.5
--1.5,		0,	"i",	-1.5
--0.5,		0,	"i",	-0.5
-0,		0,	"i",	0
-0.5,		0,	"i",	0.5
-1,		0,	"i",	1
-1.5,		0,	"i",	1.5
-2,		0,	"i",	2
-2.5,		0,	"i",	2.5
-3,		0,	"i",	3
-3.5,		0,	"i",	3.5
--2.5,		0.5,	"i",	"-2.5+0.5i"
--2.5,		0.5,	"i",	"-2.5+0.5i"
--1.5,		0.5,	"i",	"-1.5+0.5i"
--1.5,		0.5,	"i",	"-1.5+0.5i"
--0.5,		0.5,	"i",	"-0.5+0.5i"
-0,		0.5,	"i",	"0.5i"
-0.5,		0.5,	"i",	"0.5+0.5i"
-1,		0.5,	"i",	"1+0.5i"
-1.5,		0.5,	"i",	"1.5+0.5i"
-2,		0.5,	"i",	"2+0.5i"
-2.5,		0.5,	"i",	"2.5+0.5i"
-3,		0.5,	"i",	"3+0.5i"
-3.5,		0.5,	"i",	"3.5+0.5i"
--2.5,		1,	"i",	"-2.5+i"
--2.5,		1,	"i",	"-2.5+i"
--1.5,		1,	"i",	"-1.5+i"
--1.5,		1,	"i",	"-1.5+i"
--0.5,		1,	"i",	"-0.5+i"
-0,		1,	"i",	"i"
-0.5,		1,	"i",	"0.5+i"
-1,		1,	"i",	"1+i"
-1.5,		1,	"i",	"1.5+i"
-2,		1,	"i",	"2+i"
-2.5,		1,	"i",	"2.5+i"
-3,		1,	"i",	"3+i"
-3.5,		1,	"i",	"3.5+i"
--2.5,		1.5,	"i",	"-2.5+1.5i"
--2.5,		1.5,	"i",	"-2.5+1.5i"
--1.5,		1.5,	"i",	"-1.5+1.5i"
--1.5,		1.5,	"i",	"-1.5+1.5i"
--0.5,		1.5,	"i",	"-0.5+1.5i"
-0,		1.5,	"i",	"1.5i"
-0.5,		1.5,	"i",	"0.5+1.5i"
-1,		1.5,	"i",	"1+1.5i"
-1.5,		1.5,	"i",	"1.5+1.5i"
-2,		1.5,	"i",	"2+1.5i"
-2.5,		1.5,	"i",	"2.5+1.5i"
-3,		1.5,	"i",	"3+1.5i"
-3.5,		1.5,	"i",	"3.5+1.5i"
--2.5,		2,	"i",	"-2.5+2i"
--2.5,		2,	"i",	"-2.5+2i"
--1.5,		2,	"i",	"-1.5+2i"
--1.5,		2,	"i",	"-1.5+2i"
--0.5,		2,	"i",	"-0.5+2i"
-0,		2,	"i",	"2i"
-0.5,		2,	"i",	"0.5+2i"
-1,		2,	"i",	"1+2i"
-1.5,		2,	"i",	"1.5+2i"
-2,		2,	"i",	"2+2i"
-2.5,		2,	"i",	"2.5+2i"
-3,		2,	"i",	"3+2i"
-3.5,		2,	"i",	"3.5+2i"
--2.5,		2.5,	"i",	"-2.5+2.5i"
--2.5,		2.5,	"i",	"-2.5+2.5i"
--1.5,		2.5,	"i",	"-1.5+2.5i"
--1.5,		2.5,	"i",	"-1.5+2.5i"
--0.5,		2.5,	"i",	"-0.5+2.5i"
-0,		2.5,	"i",	"2.5i"
-0.5,		2.5,	"i",	"0.5+2.5i"
-1,		2.5,	"i",	"1+2.5i"
-1.5,		2.5,	"i",	"1.5+2.5i"
-2,		2.5,	"i",	"2+2.5i"
-2.5,		2.5,	"i",	"2.5+2.5i"
-3,		2.5,	"i",	"3+2.5i"
-3.5,		2.5,	"i",	"3.5+2.5i"
--2.5,		3,	"i",	"-2.5+3i"
--2.5,		3,	"i",	"-2.5+3i"
--1.5,		3,	"i",	"-1.5+3i"
--1.5,		3,	"i",	"-1.5+3i"
--0.5,		3,	"i",	"-0.5+3i"
-0,		3,	"i",	"3i"
-0.5,		3,	"i",	"0.5+3i"
-1,		3,	"i",	"1+3i"
-1.5,		3,	"i",	"1.5+3i"
-2,		3,	"i",	"2+3i"
-2.5,		3,	"i",	"2.5+3i"
-3,		3,	"i",	"3+3i"
-3.5,		3,	"i",	"3.5+3i"
--2.5,		3.5,	"i",	"-2.5+3.5i"
--2.5,		3.5,	"i",	"-2.5+3.5i"
--1.5,		3.5,	"i",	"-1.5+3.5i"
--1.5,		3.5,	"i",	"-1.5+3.5i"
--0.5,		3.5,	"i",	"-0.5+3.5i"
-0,		3.5,	"i",	"3.5i"
-0.5,		3.5,	"i",	"0.5+3.5i"
-1,		3.5,	"i",	"1+3.5i"
-1.5,		3.5,	"i",	"1.5+3.5i"
-2,		3.5,	"i",	"2+3.5i"
-2.5,		3.5,	"i",	"2.5+3.5i"
-3,		3.5,	"i",	"3+3.5i"
-3.5,		3.5,	"i",	"3.5+3.5i"
--2.5,		-2.5,	"j",	"-2.5-2.5j"
--2.5,		-2.5,	"j",	"-2.5-2.5j"
--1.5,		-2.5,	"j",	"-1.5-2.5j"
--1.5,		-2.5,	"j",	"-1.5-2.5j"
--0.5,		-2.5,	"j",	"-0.5-2.5j"
-0,		-2.5,	"j",	"-2.5j"
-0.5,		-2.5,	"j",	"0.5-2.5j"
-1,		-2.5,	"j",	"1-2.5j"
-1.5,		-2.5,	"j",	"1.5-2.5j"
-2,		-2.5,	"j",	"2-2.5j"
-2.5,		-2.5,	"j",	"2.5-2.5j"
-3,		-2.5,	"j",	"3-2.5j"
-3.5,		-2.5,	"j",	"3.5-2.5j"
--2.5,		-2.5,	"j",	"-2.5-2.5j"
--2.5,		-2.5,	"j",	"-2.5-2.5j"
--1.5,		-2.5,	"j",	"-1.5-2.5j"
--1.5,		-2.5,	"j",	"-1.5-2.5j"
--0.5,		-2.5,	"j",	"-0.5-2.5j"
-0,		-2.5,	"j",	"-2.5j"
-0.5,		-2.5,	"j",	"0.5-2.5j"
-1,		-2.5,	"j",	"1-2.5j"
-1.5,		-2.5,	"j",	"1.5-2.5j"
-2,		-2.5,	"j",	"2-2.5j"
-2.5,		-2.5,	"j",	"2.5-2.5j"
-3,		-2.5,	"j",	"3-2.5j"
-3.5,		-2.5,	"j",	"3.5-2.5j"
--2.5,		-1.5,	"j",	"-2.5-1.5j"
--2.5,		-1.5,	"j",	"-2.5-1.5j"
--1.5,		-1.5,	"j",	"-1.5-1.5j"
--1.5,		-1.5,	"j",	"-1.5-1.5j"
--0.5,		-1.5,	"j",	"-0.5-1.5j"
-0,		-1.5,	"j",	"-1.5j"
-0.5,		-1.5,	"j",	"0.5-1.5j"
-1,		-1.5,	"j",	"1-1.5j"
-1.5,		-1.5,	"j",	"1.5-1.5j"
-2,		-1.5,	"j",	"2-1.5j"
-2.5,		-1.5,	"j",	"2.5-1.5j"
-3,		-1.5,	"j",	"3-1.5j"
-3.5,		-1.5,	"j",	"3.5-1.5j"
--2.5,		-1.5,	"j",	"-2.5-1.5j"
--2.5,		-1.5,	"j",	"-2.5-1.5j"
--1.5,		-1.5,	"j",	"-1.5-1.5j"
--1.5,		-1.5,	"j",	"-1.5-1.5j"
--0.5,		-1.5,	"j",	"-0.5-1.5j"
-0,		-1.5,	"j",	"-1.5j"
-0.5,		-1.5,	"j",	"0.5-1.5j"
-1,		-1.5,	"j",	"1-1.5j"
-1.5,		-1.5,	"j",	"1.5-1.5j"
-2,		-1.5,	"j",	"2-1.5j"
-2.5,		-1.5,	"j",	"2.5-1.5j"
-3,		-1.5,	"j",	"3-1.5j"
-3.5,		-1.5,	"j",	"3.5-1.5j"
--2.5,		-0.5,	"j",	"-2.5-0.5j"
--2.5,		-0.5,	"j",	"-2.5-0.5j"
--1.5,		-0.5,	"j",	"-1.5-0.5j"
--1.5,		-0.5,	"j",	"-1.5-0.5j"
--0.5,		-0.5,	"j",	"-0.5-0.5j"
-0,		-0.5,	"j",	"-0.5j"
-0.5,		-0.5,	"j",	"0.5-0.5j"
-1,		-0.5,	"j",	"1-0.5j"
-1.5,		-0.5,	"j",	"1.5-0.5j"
-2,		-0.5,	"j",	"2-0.5j"
-2.5,		-0.5,	"j",	"2.5-0.5j"
-3,		-0.5,	"j",	"3-0.5j"
-3.5,		-0.5,	"j",	"3.5-0.5j"
--2.5,		0,	"j",	-2.5
--2.5,		0,	"j",	-2.5
--1.5,		0,	"j",	-1.5
--1.5,		0,	"j",	-1.5
--0.5,		0,	"j",	-0.5
-0,		0,	"j",	0
-0.5,		0,	"j",	0.5
-1,		0,	"j",	1
-1.5,		0,	"j",	1.5
-2,		0,	"j",	2
-2.5,		0,	"j",	2.5
-3,		0,	"j",	3
-3.5,		0,	"j",	3.5
--2.5,		0.5,	"j",	"-2.5+0.5j"
--2.5,		0.5,	"j",	"-2.5+0.5j"
--1.5,		0.5,	"j",	"-1.5+0.5j"
--1.5,		0.5,	"j",	"-1.5+0.5j"
--0.5,		0.5,	"j",	"-0.5+0.5j"
-0,		0.5,	"j",	"0.5j"
-0.5,		0.5,	"j",	"0.5+0.5j"
-1,		0.5,	"j",	"1+0.5j"
-1.5,		0.5,	"j",	"1.5+0.5j"
-2,		0.5,	"j",	"2+0.5j"
-2.5,		0.5,	"j",	"2.5+0.5j"
-3,		0.5,	"j",	"3+0.5j"
-3.5,		0.5,	"j",	"3.5+0.5j"
--2.5,		1,	"j",	"-2.5+j"
--2.5,		1,	"j",	"-2.5+j"
--1.5,		1,	"j",	"-1.5+j"
--1.5,		1,	"j",	"-1.5+j"
--0.5,		1,	"j",	"-0.5+j"
-0,		1,	"j",	"j"
-0.5,		1,	"j",	"0.5+j"
-1,		1,	"j",	"1+j"
-1.5,		1,	"j",	"1.5+j"
-2,		1,	"j",	"2+j"
-2.5,		1,	"j",	"2.5+j"
-3,		1,	"j",	"3+j"
-3.5,		1,	"j",	"3.5+j"
--2.5,		1.5,	"j",	"-2.5+1.5j"
--2.5,		1.5,	"j",	"-2.5+1.5j"
--1.5,		1.5,	"j",	"-1.5+1.5j"
--1.5,		1.5,	"j",	"-1.5+1.5j"
--0.5,		1.5,	"j",	"-0.5+1.5j"
-0,		1.5,	"j",	"1.5j"
-0.5,		1.5,	"j",	"0.5+1.5j"
-1,		1.5,	"j",	"1+1.5j"
-1.5,		1.5,	"j",	"1.5+1.5j"
-2,		1.5,	"j",	"2+1.5j"
-2.5,		1.5,	"j",	"2.5+1.5j"
-3,		1.5,	"j",	"3+1.5j"
-3.5,		1.5,	"j",	"3.5+1.5j"
--2.5,		2,	"j",	"-2.5+2j"
--2.5,		2,	"j",	"-2.5+2j"
--1.5,		2,	"j",	"-1.5+2j"
--1.5,		2,	"j",	"-1.5+2j"
--0.5,		2,	"j",	"-0.5+2j"
-0,		2,	"j",	"2j"
-0.5,		2,	"j",	"0.5+2j"
-1,		2,	"j",	"1+2j"
-1.5,		2,	"j",	"1.5+2j"
-2,		2,	"j",	"2+2j"
-2.5,		2,	"j",	"2.5+2j"
-3,		2,	"j",	"3+2j"
-3.5,		2,	"j",	"3.5+2j"
--2.5,		2.5,	"j",	"-2.5+2.5j"
--2.5,		2.5,	"j",	"-2.5+2.5j"
--1.5,		2.5,	"j",	"-1.5+2.5j"
--1.5,		2.5,	"j",	"-1.5+2.5j"
--0.5,		2.5,	"j",	"-0.5+2.5j"
-0,		2.5,	"j",	"2.5j"
-0.5,		2.5,	"j",	"0.5+2.5j"
-1,		2.5,	"j",	"1+2.5j"
-1.5,		2.5,	"j",	"1.5+2.5j"
-2,		2.5,	"j",	"2+2.5j"
-2.5,		2.5,	"j",	"2.5+2.5j"
-3,		2.5,	"j",	"3+2.5j"
-3.5,		2.5,	"j",	"3.5+2.5j"
--2.5,		3,	"j",	"-2.5+3j"
--2.5,		3,	"j",	"-2.5+3j"
--1.5,		3,	"j",	"-1.5+3j"
--1.5,		3,	"j",	"-1.5+3j"
--0.5,		3,	"j",	"-0.5+3j"
-0,		3,	"j",	"3j"
-0.5,		3,	"j",	"0.5+3j"
-1,		3,	"j",	"1+3j"
-1.5,		3,	"j",	"1.5+3j"
-2,		3,	"j",	"2+3j"
-2.5,		3,	"j",	"2.5+3j"
-3,		3,	"j",	"3+3j"
-3.5,		3,	"j",	"3.5+3j"
--2.5,		3.5,	"j",	"-2.5+3.5j"
--2.5,		3.5,	"j",	"-2.5+3.5j"
--1.5,		3.5,	"j",	"-1.5+3.5j"
--1.5,		3.5,	"j",	"-1.5+3.5j"
--0.5,		3.5,	"j",	"-0.5+3.5j"
-0,		3.5,	"j",	"3.5j"
-0.5,		3.5,	"j",	"0.5+3.5j"
-1,		3.5,	"j",	"1+3.5j"
-1.5,		3.5,	"j",	"1.5+3.5j"
-2,		3.5,	"j",	"2+3.5j"
-2.5,		3.5,	"j",	"2.5+3.5j"
-3,		3.5,	"j",	"3+3.5j"
-3.5,		3.5,	"j",	"3.5+3.5j"
--1.23,		-4.56,		"-1.23-4.56i"
-0,		-3.21,	"i",	"-3.21i"
-1.23,		-2.34,	"j",	"1.23-2.34j"
--1.23,		0,		-1.23
-0,		0,	"i",	0
-1.23,		0,	"j",	1.23
--1.23,		4.56,		"-1.23+4.56i"
-0,		3.21,	"i",	"3.21i"
-1.23,		2.34,	"j",	"1.23+2.34j"
+3,		4,		"3+4i"
+3,		4,	"j",	"3+4j"
+12.34,		5.67,	"j",	"12.34+5.67j"
+3.5,		"A",		"#VALUE!"
+1.234E-5,	6.78E9,		"1.234E-5+6780000000i"
+1.234E5,	6.78E-9,	"123400+6.78E-9i"
+3.5,		2.5,		"3.5+2.5i"
+3.5,		1,		"3.5+i"
+3.5,		0,		3.5
+3.5,		-1,		"3.5-i"
+3.5,		-2.5,		"3.5-2.5i"
+1,		2.5,		"1+2.5i"
+1,		1,		"1+i"
+1,		0,		1
+1,		-1,		"1-i"
+1,		-2.5,		"1-2.5i"
+0,		2.5,		"2.5i"
+0,		1,		"i"
+0,		0,		0
+0,		-1,		"-i"
+0,		-2.5,		"-2.5i"
+-1,		2.5,		"-1+2.5i"
+-1,		1,		"-1+i"
+-1,		0,		-1
+-1,		-1,		"-1-i"
+-1,		-2.5,		"-1-2.5i"
+-3.5,		2.5,		"-3.5+2.5i"
+-3.5,		1,		"-3.5+i"
+-3.5,		0,		"-3.5"
+-3.5,		-1,		"-3.5-i"
+-3.5,		-2.5,		"-3.5-2.5i"
+-2.5,		-2.5,		"-2.5-2.5i"
+-2.5,		-2.5,		"-2.5-2.5i"
+-1.5,		-2.5,		"-1.5-2.5i"
+-1.5,		-2.5,		"-1.5-2.5i"
+-0.5,		-2.5,		"-0.5-2.5i"
+0,		-2.5,		"-2.5i"
+0.5,		-2.5,		"0.5-2.5i"
+1,		-2.5,		"1-2.5i"
+1.5,		-2.5,		"1.5-2.5i"
+2,		-2.5,		"2-2.5i"
+2.5,		-2.5,		"2.5-2.5i"
+3,		-2.5,		"3-2.5i"
+3.5,		-2.5,		"3.5-2.5i"
+-2.5,		-2.5,		"-2.5-2.5i"
+-2.5,		-2.5,		"-2.5-2.5i"
+-1.5,		-2.5,		"-1.5-2.5i"
+-1.5,		-2.5,		"-1.5-2.5i"
+-0.5,		-2.5,		"-0.5-2.5i"
+0,		-2.5,		"-2.5i"
+0.5,		-2.5,		"0.5-2.5i"
+1,		-2.5,		"1-2.5i"
+1.5,		-2.5,		"1.5-2.5i"
+2,		-2.5,		"2-2.5i"
+2.5,		-2.5,		"2.5-2.5i"
+3,		-2.5,		"3-2.5i"
+3.5,		-2.5,		"3.5-2.5i"
+-2.5,		-1.5,		"-2.5-1.5i"
+-2.5,		-1.5,		"-2.5-1.5i"
+-1.5,		-1.5,		"-1.5-1.5i"
+-1.5,		-1.5,		"-1.5-1.5i"
+-0.5,		-1.5,		"-0.5-1.5i"
+0,		-1.5,		"-1.5i"
+0.5,		-1.5,		"0.5-1.5i"
+1,		-1.5,		"1-1.5i"
+1.5,		-1.5,		"1.5-1.5i"
+2,		-1.5,		"2-1.5i"
+2.5,		-1.5,		"2.5-1.5i"
+3,		-1.5,		"3-1.5i"
+3.5,		-1.5,		"3.5-1.5i"
+-2.5,		-1.5,		"-2.5-1.5i"
+-2.5,		-1.5,		"-2.5-1.5i"
+-1.5,		-1.5,		"-1.5-1.5i"
+-1.5,		-1.5,		"-1.5-1.5i"
+-0.5,		-1.5,		"-0.5-1.5i"
+0,		-1.5,		"-1.5i"
+0.5,		-1.5,		"0.5-1.5i"
+1,		-1.5,		"1-1.5i"
+1.5,		-1.5,		"1.5-1.5i"
+2,		-1.5,		"2-1.5i"
+2.5,		-1.5,		"2.5-1.5i"
+3,		-1.5,		"3-1.5i"
+3.5,		-1.5,		"3.5-1.5i"
+-2.5,		-0.5,		"-2.5-0.5i"
+-2.5,		-0.5,		"-2.5-0.5i"
+-1.5,		-0.5,		"-1.5-0.5i"
+-1.5,		-0.5,		"-1.5-0.5i"
+-0.5,		-0.5,		"-0.5-0.5i"
+0,		-0.5,		"-0.5i"
+0.5,		-0.5,		"0.5-0.5i"
+1,		-0.5,		"1-0.5i"
+1.5,		-0.5,		"1.5-0.5i"
+2,		-0.5,		"2-0.5i"
+2.5,		-0.5,		"2.5-0.5i"
+3,		-0.5,		"3-0.5i"
+3.5,		-0.5,		"3.5-0.5i"
+-2.5,		0,		-2.5
+-2.5,		0,		-2.5
+-1.5,		0,		-1.5
+-1.5,		0,		-1.5
+-0.5,		0,		-0.5
+0,		0,		0
+0.5,		0,		0.5
+1,		0,		1
+1.5,		0,		1.5
+2,		0,		2
+2.5,		0,		2.5
+3,		0,		3
+3.5,		0,		3.5
+-2.5,		0.5,		"-2.5+0.5i"
+-2.5,		0.5,		"-2.5+0.5i"
+-1.5,		0.5,		"-1.5+0.5i"
+-1.5,		0.5,		"-1.5+0.5i"
+-0.5,		0.5,		"-0.5+0.5i"
+0,		0.5,		"0.5i"
+0.5,		0.5,		"0.5+0.5i"
+1,		0.5,		"1+0.5i"
+1.5,		0.5,		"1.5+0.5i"
+2,		0.5,		"2+0.5i"
+2.5,		0.5,		"2.5+0.5i"
+3,		0.5,		"3+0.5i"
+3.5,		0.5,		"3.5+0.5i"
+-2.5,		1,		"-2.5+i"
+-2.5,		1,		"-2.5+i"
+-1.5,		1,		"-1.5+i"
+-1.5,		1,		"-1.5+i"
+-0.5,		1,		"-0.5+i"
+0,		1,		"i"
+0.5,		1,		"0.5+i"
+1,		1,		"1+i"
+1.5,		1,		"1.5+i"
+2,		1,		"2+i"
+2.5,		1,		"2.5+i"
+3,		1,		"3+i"
+3.5,		1,		"3.5+i"
+-2.5,		1.5,		"-2.5+1.5i"
+-2.5,		1.5,		"-2.5+1.5i"
+-1.5,		1.5,		"-1.5+1.5i"
+-1.5,		1.5,		"-1.5+1.5i"
+-0.5,		1.5,		"-0.5+1.5i"
+0,		1.5,		"1.5i"
+0.5,		1.5,		"0.5+1.5i"
+1,		1.5,		"1+1.5i"
+1.5,		1.5,		"1.5+1.5i"
+2,		1.5,		"2+1.5i"
+2.5,		1.5,		"2.5+1.5i"
+3,		1.5,		"3+1.5i"
+3.5,		1.5,		"3.5+1.5i"
+-2.5,		2,		"-2.5+2i"
+-2.5,		2,		"-2.5+2i"
+-1.5,		2,		"-1.5+2i"
+-1.5,		2,		"-1.5+2i"
+-0.5,		2,		"-0.5+2i"
+0,		2,		"2i"
+0.5,		2,		"0.5+2i"
+1,		2,		"1+2i"
+1.5,		2,		"1.5+2i"
+2,		2,		"2+2i"
+2.5,		2,		"2.5+2i"
+3,		2,		"3+2i"
+3.5,		2,		"3.5+2i"
+-2.5,		2.5,		"-2.5+2.5i"
+-2.5,		2.5,		"-2.5+2.5i"
+-1.5,		2.5,		"-1.5+2.5i"
+-1.5,		2.5,		"-1.5+2.5i"
+-0.5,		2.5,		"-0.5+2.5i"
+0,		2.5,		"2.5i"
+0.5,		2.5,		"0.5+2.5i"
+1,		2.5,		"1+2.5i"
+1.5,		2.5,		"1.5+2.5i"
+2,		2.5,		"2+2.5i"
+2.5,		2.5,		"2.5+2.5i"
+3,		2.5,		"3+2.5i"
+3.5,		2.5,		"3.5+2.5i"
+-2.5,		3,		"-2.5+3i"
+-2.5,		3,		"-2.5+3i"
+-1.5,		3,		"-1.5+3i"
+-1.5,		3,		"-1.5+3i"
+-0.5,		3,		"-0.5+3i"
+0,		3,		"3i"
+0.5,		3,		"0.5+3i"
+1,		3,		"1+3i"
+1.5,		3,		"1.5+3i"
+2,		3,		"2+3i"
+2.5,		3,		"2.5+3i"
+3,		3,		"3+3i"
+3.5,		3,		"3.5+3i"
+-2.5,		3.5,		"-2.5+3.5i"
+-2.5,		3.5,		"-2.5+3.5i"
+-1.5,		3.5,		"-1.5+3.5i"
+-1.5,		3.5,		"-1.5+3.5i"
+-0.5,		3.5,		"-0.5+3.5i"
+0,		3.5,		"3.5i"
+0.5,		3.5,		"0.5+3.5i"
+1,		3.5,		"1+3.5i"
+1.5,		3.5,		"1.5+3.5i"
+2,		3.5,		"2+3.5i"
+2.5,		3.5,		"2.5+3.5i"
+3,		3.5,		"3+3.5i"
+3.5,		3.5,		"3.5+3.5i"
+-2.5,		-2.5,	"i",	"-2.5-2.5i"
+-2.5,		-2.5,	"i",	"-2.5-2.5i"
+-1.5,		-2.5,	"i",	"-1.5-2.5i"
+-1.5,		-2.5,	"i",	"-1.5-2.5i"
+-0.5,		-2.5,	"i",	"-0.5-2.5i"
+0,		-2.5,	"i",	"-2.5i"
+0.5,		-2.5,	"i",	"0.5-2.5i"
+1,		-2.5,	"i",	"1-2.5i"
+1.5,		-2.5,	"i",	"1.5-2.5i"
+2,		-2.5,	"i",	"2-2.5i"
+2.5,		-2.5,	"i",	"2.5-2.5i"
+3,		-2.5,	"i",	"3-2.5i"
+3.5,		-2.5,	"i",	"3.5-2.5i"
+-2.5,		-2.5,	"i",	"-2.5-2.5i"
+-2.5,		-2.5,	"i",	"-2.5-2.5i"
+-1.5,		-2.5,	"i",	"-1.5-2.5i"
+-1.5,		-2.5,	"i",	"-1.5-2.5i"
+-0.5,		-2.5,	"i",	"-0.5-2.5i"
+0,		-2.5,	"i",	"-2.5i"
+0.5,		-2.5,	"i",	"0.5-2.5i"
+1,		-2.5,	"i",	"1-2.5i"
+1.5,		-2.5,	"i",	"1.5-2.5i"
+2,		-2.5,	"i",	"2-2.5i"
+2.5,		-2.5,	"i",	"2.5-2.5i"
+3,		-2.5,	"i",	"3-2.5i"
+3.5,		-2.5,	"i",	"3.5-2.5i"
+-2.5,		-1.5,	"i",	"-2.5-1.5i"
+-2.5,		-1.5,	"i",	"-2.5-1.5i"
+-1.5,		-1.5,	"i",	"-1.5-1.5i"
+-1.5,		-1.5,	"i",	"-1.5-1.5i"
+-0.5,		-1.5,	"i",	"-0.5-1.5i"
+0,		-1.5,	"i",	"-1.5i"
+0.5,		-1.5,	"i",	"0.5-1.5i"
+1,		-1.5,	"i",	"1-1.5i"
+1.5,		-1.5,	"i",	"1.5-1.5i"
+2,		-1.5,	"i",	"2-1.5i"
+2.5,		-1.5,	"i",	"2.5-1.5i"
+3,		-1.5,	"i",	"3-1.5i"
+3.5,		-1.5,	"i",	"3.5-1.5i"
+-2.5,		-1.5,	"i",	"-2.5-1.5i"
+-2.5,		-1.5,	"i",	"-2.5-1.5i"
+-1.5,		-1.5,	"i",	"-1.5-1.5i"
+-1.5,		-1.5,	"i",	"-1.5-1.5i"
+-0.5,		-1.5,	"i",	"-0.5-1.5i"
+0,		-1.5,	"i",	"-1.5i"
+0.5,		-1.5,	"i",	"0.5-1.5i"
+1,		-1.5,	"i",	"1-1.5i"
+1.5,		-1.5,	"i",	"1.5-1.5i"
+2,		-1.5,	"i",	"2-1.5i"
+2.5,		-1.5,	"i",	"2.5-1.5i"
+3,		-1.5,	"i",	"3-1.5i"
+3.5,		-1.5,	"i",	"3.5-1.5i"
+-2.5,		-0.5,	"i",	"-2.5-0.5i"
+-2.5,		-0.5,	"i",	"-2.5-0.5i"
+-1.5,		-0.5,	"i",	"-1.5-0.5i"
+-1.5,		-0.5,	"i",	"-1.5-0.5i"
+-0.5,		-0.5,	"i",	"-0.5-0.5i"
+0,		-0.5,	"i",	"-0.5i"
+0.5,		-0.5,	"i",	"0.5-0.5i"
+1,		-0.5,	"i",	"1-0.5i"
+1.5,		-0.5,	"i",	"1.5-0.5i"
+2,		-0.5,	"i",	"2-0.5i"
+2.5,		-0.5,	"i",	"2.5-0.5i"
+3,		-0.5,	"i",	"3-0.5i"
+3.5,		-0.5,	"i",	"3.5-0.5i"
+-2.5,		0,	"i",	-2.5
+-2.5,		0,	"i",	-2.5
+-1.5,		0,	"i",	-1.5
+-1.5,		0,	"i",	-1.5
+-0.5,		0,	"i",	-0.5
+0,		0,	"i",	0
+0.5,		0,	"i",	0.5
+1,		0,	"i",	1
+1.5,		0,	"i",	1.5
+2,		0,	"i",	2
+2.5,		0,	"i",	2.5
+3,		0,	"i",	3
+3.5,		0,	"i",	3.5
+-2.5,		0.5,	"i",	"-2.5+0.5i"
+-2.5,		0.5,	"i",	"-2.5+0.5i"
+-1.5,		0.5,	"i",	"-1.5+0.5i"
+-1.5,		0.5,	"i",	"-1.5+0.5i"
+-0.5,		0.5,	"i",	"-0.5+0.5i"
+0,		0.5,	"i",	"0.5i"
+0.5,		0.5,	"i",	"0.5+0.5i"
+1,		0.5,	"i",	"1+0.5i"
+1.5,		0.5,	"i",	"1.5+0.5i"
+2,		0.5,	"i",	"2+0.5i"
+2.5,		0.5,	"i",	"2.5+0.5i"
+3,		0.5,	"i",	"3+0.5i"
+3.5,		0.5,	"i",	"3.5+0.5i"
+-2.5,		1,	"i",	"-2.5+i"
+-2.5,		1,	"i",	"-2.5+i"
+-1.5,		1,	"i",	"-1.5+i"
+-1.5,		1,	"i",	"-1.5+i"
+-0.5,		1,	"i",	"-0.5+i"
+0,		1,	"i",	"i"
+0.5,		1,	"i",	"0.5+i"
+1,		1,	"i",	"1+i"
+1.5,		1,	"i",	"1.5+i"
+2,		1,	"i",	"2+i"
+2.5,		1,	"i",	"2.5+i"
+3,		1,	"i",	"3+i"
+3.5,		1,	"i",	"3.5+i"
+-2.5,		1.5,	"i",	"-2.5+1.5i"
+-2.5,		1.5,	"i",	"-2.5+1.5i"
+-1.5,		1.5,	"i",	"-1.5+1.5i"
+-1.5,		1.5,	"i",	"-1.5+1.5i"
+-0.5,		1.5,	"i",	"-0.5+1.5i"
+0,		1.5,	"i",	"1.5i"
+0.5,		1.5,	"i",	"0.5+1.5i"
+1,		1.5,	"i",	"1+1.5i"
+1.5,		1.5,	"i",	"1.5+1.5i"
+2,		1.5,	"i",	"2+1.5i"
+2.5,		1.5,	"i",	"2.5+1.5i"
+3,		1.5,	"i",	"3+1.5i"
+3.5,		1.5,	"i",	"3.5+1.5i"
+-2.5,		2,	"i",	"-2.5+2i"
+-2.5,		2,	"i",	"-2.5+2i"
+-1.5,		2,	"i",	"-1.5+2i"
+-1.5,		2,	"i",	"-1.5+2i"
+-0.5,		2,	"i",	"-0.5+2i"
+0,		2,	"i",	"2i"
+0.5,		2,	"i",	"0.5+2i"
+1,		2,	"i",	"1+2i"
+1.5,		2,	"i",	"1.5+2i"
+2,		2,	"i",	"2+2i"
+2.5,		2,	"i",	"2.5+2i"
+3,		2,	"i",	"3+2i"
+3.5,		2,	"i",	"3.5+2i"
+-2.5,		2.5,	"i",	"-2.5+2.5i"
+-2.5,		2.5,	"i",	"-2.5+2.5i"
+-1.5,		2.5,	"i",	"-1.5+2.5i"
+-1.5,		2.5,	"i",	"-1.5+2.5i"
+-0.5,		2.5,	"i",	"-0.5+2.5i"
+0,		2.5,	"i",	"2.5i"
+0.5,		2.5,	"i",	"0.5+2.5i"
+1,		2.5,	"i",	"1+2.5i"
+1.5,		2.5,	"i",	"1.5+2.5i"
+2,		2.5,	"i",	"2+2.5i"
+2.5,		2.5,	"i",	"2.5+2.5i"
+3,		2.5,	"i",	"3+2.5i"
+3.5,		2.5,	"i",	"3.5+2.5i"
+-2.5,		3,	"i",	"-2.5+3i"
+-2.5,		3,	"i",	"-2.5+3i"
+-1.5,		3,	"i",	"-1.5+3i"
+-1.5,		3,	"i",	"-1.5+3i"
+-0.5,		3,	"i",	"-0.5+3i"
+0,		3,	"i",	"3i"
+0.5,		3,	"i",	"0.5+3i"
+1,		3,	"i",	"1+3i"
+1.5,		3,	"i",	"1.5+3i"
+2,		3,	"i",	"2+3i"
+2.5,		3,	"i",	"2.5+3i"
+3,		3,	"i",	"3+3i"
+3.5,		3,	"i",	"3.5+3i"
+-2.5,		3.5,	"i",	"-2.5+3.5i"
+-2.5,		3.5,	"i",	"-2.5+3.5i"
+-1.5,		3.5,	"i",	"-1.5+3.5i"
+-1.5,		3.5,	"i",	"-1.5+3.5i"
+-0.5,		3.5,	"i",	"-0.5+3.5i"
+0,		3.5,	"i",	"3.5i"
+0.5,		3.5,	"i",	"0.5+3.5i"
+1,		3.5,	"i",	"1+3.5i"
+1.5,		3.5,	"i",	"1.5+3.5i"
+2,		3.5,	"i",	"2+3.5i"
+2.5,		3.5,	"i",	"2.5+3.5i"
+3,		3.5,	"i",	"3+3.5i"
+3.5,		3.5,	"i",	"3.5+3.5i"
+-2.5,		-2.5,	"j",	"-2.5-2.5j"
+-2.5,		-2.5,	"j",	"-2.5-2.5j"
+-1.5,		-2.5,	"j",	"-1.5-2.5j"
+-1.5,		-2.5,	"j",	"-1.5-2.5j"
+-0.5,		-2.5,	"j",	"-0.5-2.5j"
+0,		-2.5,	"j",	"-2.5j"
+0.5,		-2.5,	"j",	"0.5-2.5j"
+1,		-2.5,	"j",	"1-2.5j"
+1.5,		-2.5,	"j",	"1.5-2.5j"
+2,		-2.5,	"j",	"2-2.5j"
+2.5,		-2.5,	"j",	"2.5-2.5j"
+3,		-2.5,	"j",	"3-2.5j"
+3.5,		-2.5,	"j",	"3.5-2.5j"
+-2.5,		-2.5,	"j",	"-2.5-2.5j"
+-2.5,		-2.5,	"j",	"-2.5-2.5j"
+-1.5,		-2.5,	"j",	"-1.5-2.5j"
+-1.5,		-2.5,	"j",	"-1.5-2.5j"
+-0.5,		-2.5,	"j",	"-0.5-2.5j"
+0,		-2.5,	"j",	"-2.5j"
+0.5,		-2.5,	"j",	"0.5-2.5j"
+1,		-2.5,	"j",	"1-2.5j"
+1.5,		-2.5,	"j",	"1.5-2.5j"
+2,		-2.5,	"j",	"2-2.5j"
+2.5,		-2.5,	"j",	"2.5-2.5j"
+3,		-2.5,	"j",	"3-2.5j"
+3.5,		-2.5,	"j",	"3.5-2.5j"
+-2.5,		-1.5,	"j",	"-2.5-1.5j"
+-2.5,		-1.5,	"j",	"-2.5-1.5j"
+-1.5,		-1.5,	"j",	"-1.5-1.5j"
+-1.5,		-1.5,	"j",	"-1.5-1.5j"
+-0.5,		-1.5,	"j",	"-0.5-1.5j"
+0,		-1.5,	"j",	"-1.5j"
+0.5,		-1.5,	"j",	"0.5-1.5j"
+1,		-1.5,	"j",	"1-1.5j"
+1.5,		-1.5,	"j",	"1.5-1.5j"
+2,		-1.5,	"j",	"2-1.5j"
+2.5,		-1.5,	"j",	"2.5-1.5j"
+3,		-1.5,	"j",	"3-1.5j"
+3.5,		-1.5,	"j",	"3.5-1.5j"
+-2.5,		-1.5,	"j",	"-2.5-1.5j"
+-2.5,		-1.5,	"j",	"-2.5-1.5j"
+-1.5,		-1.5,	"j",	"-1.5-1.5j"
+-1.5,		-1.5,	"j",	"-1.5-1.5j"
+-0.5,		-1.5,	"j",	"-0.5-1.5j"
+0,		-1.5,	"j",	"-1.5j"
+0.5,		-1.5,	"j",	"0.5-1.5j"
+1,		-1.5,	"j",	"1-1.5j"
+1.5,		-1.5,	"j",	"1.5-1.5j"
+2,		-1.5,	"j",	"2-1.5j"
+2.5,		-1.5,	"j",	"2.5-1.5j"
+3,		-1.5,	"j",	"3-1.5j"
+3.5,		-1.5,	"j",	"3.5-1.5j"
+-2.5,		-0.5,	"j",	"-2.5-0.5j"
+-2.5,		-0.5,	"j",	"-2.5-0.5j"
+-1.5,		-0.5,	"j",	"-1.5-0.5j"
+-1.5,		-0.5,	"j",	"-1.5-0.5j"
+-0.5,		-0.5,	"j",	"-0.5-0.5j"
+0,		-0.5,	"j",	"-0.5j"
+0.5,		-0.5,	"j",	"0.5-0.5j"
+1,		-0.5,	"j",	"1-0.5j"
+1.5,		-0.5,	"j",	"1.5-0.5j"
+2,		-0.5,	"j",	"2-0.5j"
+2.5,		-0.5,	"j",	"2.5-0.5j"
+3,		-0.5,	"j",	"3-0.5j"
+3.5,		-0.5,	"j",	"3.5-0.5j"
+-2.5,		0,	"j",	-2.5
+-2.5,		0,	"j",	-2.5
+-1.5,		0,	"j",	-1.5
+-1.5,		0,	"j",	-1.5
+-0.5,		0,	"j",	-0.5
+0,		0,	"j",	0
+0.5,		0,	"j",	0.5
+1,		0,	"j",	1
+1.5,		0,	"j",	1.5
+2,		0,	"j",	2
+2.5,		0,	"j",	2.5
+3,		0,	"j",	3
+3.5,		0,	"j",	3.5
+-2.5,		0.5,	"j",	"-2.5+0.5j"
+-2.5,		0.5,	"j",	"-2.5+0.5j"
+-1.5,		0.5,	"j",	"-1.5+0.5j"
+-1.5,		0.5,	"j",	"-1.5+0.5j"
+-0.5,		0.5,	"j",	"-0.5+0.5j"
+0,		0.5,	"j",	"0.5j"
+0.5,		0.5,	"j",	"0.5+0.5j"
+1,		0.5,	"j",	"1+0.5j"
+1.5,		0.5,	"j",	"1.5+0.5j"
+2,		0.5,	"j",	"2+0.5j"
+2.5,		0.5,	"j",	"2.5+0.5j"
+3,		0.5,	"j",	"3+0.5j"
+3.5,		0.5,	"j",	"3.5+0.5j"
+-2.5,		1,	"j",	"-2.5+j"
+-2.5,		1,	"j",	"-2.5+j"
+-1.5,		1,	"j",	"-1.5+j"
+-1.5,		1,	"j",	"-1.5+j"
+-0.5,		1,	"j",	"-0.5+j"
+0,		1,	"j",	"j"
+0.5,		1,	"j",	"0.5+j"
+1,		1,	"j",	"1+j"
+1.5,		1,	"j",	"1.5+j"
+2,		1,	"j",	"2+j"
+2.5,		1,	"j",	"2.5+j"
+3,		1,	"j",	"3+j"
+3.5,		1,	"j",	"3.5+j"
+-2.5,		1.5,	"j",	"-2.5+1.5j"
+-2.5,		1.5,	"j",	"-2.5+1.5j"
+-1.5,		1.5,	"j",	"-1.5+1.5j"
+-1.5,		1.5,	"j",	"-1.5+1.5j"
+-0.5,		1.5,	"j",	"-0.5+1.5j"
+0,		1.5,	"j",	"1.5j"
+0.5,		1.5,	"j",	"0.5+1.5j"
+1,		1.5,	"j",	"1+1.5j"
+1.5,		1.5,	"j",	"1.5+1.5j"
+2,		1.5,	"j",	"2+1.5j"
+2.5,		1.5,	"j",	"2.5+1.5j"
+3,		1.5,	"j",	"3+1.5j"
+3.5,		1.5,	"j",	"3.5+1.5j"
+-2.5,		2,	"j",	"-2.5+2j"
+-2.5,		2,	"j",	"-2.5+2j"
+-1.5,		2,	"j",	"-1.5+2j"
+-1.5,		2,	"j",	"-1.5+2j"
+-0.5,		2,	"j",	"-0.5+2j"
+0,		2,	"j",	"2j"
+0.5,		2,	"j",	"0.5+2j"
+1,		2,	"j",	"1+2j"
+1.5,		2,	"j",	"1.5+2j"
+2,		2,	"j",	"2+2j"
+2.5,		2,	"j",	"2.5+2j"
+3,		2,	"j",	"3+2j"
+3.5,		2,	"j",	"3.5+2j"
+-2.5,		2.5,	"j",	"-2.5+2.5j"
+-2.5,		2.5,	"j",	"-2.5+2.5j"
+-1.5,		2.5,	"j",	"-1.5+2.5j"
+-1.5,		2.5,	"j",	"-1.5+2.5j"
+-0.5,		2.5,	"j",	"-0.5+2.5j"
+0,		2.5,	"j",	"2.5j"
+0.5,		2.5,	"j",	"0.5+2.5j"
+1,		2.5,	"j",	"1+2.5j"
+1.5,		2.5,	"j",	"1.5+2.5j"
+2,		2.5,	"j",	"2+2.5j"
+2.5,		2.5,	"j",	"2.5+2.5j"
+3,		2.5,	"j",	"3+2.5j"
+3.5,		2.5,	"j",	"3.5+2.5j"
+-2.5,		3,	"j",	"-2.5+3j"
+-2.5,		3,	"j",	"-2.5+3j"
+-1.5,		3,	"j",	"-1.5+3j"
+-1.5,		3,	"j",	"-1.5+3j"
+-0.5,		3,	"j",	"-0.5+3j"
+0,		3,	"j",	"3j"
+0.5,		3,	"j",	"0.5+3j"
+1,		3,	"j",	"1+3j"
+1.5,		3,	"j",	"1.5+3j"
+2,		3,	"j",	"2+3j"
+2.5,		3,	"j",	"2.5+3j"
+3,		3,	"j",	"3+3j"
+3.5,		3,	"j",	"3.5+3j"
+-2.5,		3.5,	"j",	"-2.5+3.5j"
+-2.5,		3.5,	"j",	"-2.5+3.5j"
+-1.5,		3.5,	"j",	"-1.5+3.5j"
+-1.5,		3.5,	"j",	"-1.5+3.5j"
+-0.5,		3.5,	"j",	"-0.5+3.5j"
+0,		3.5,	"j",	"3.5j"
+0.5,		3.5,	"j",	"0.5+3.5j"
+1,		3.5,	"j",	"1+3.5j"
+1.5,		3.5,	"j",	"1.5+3.5j"
+2,		3.5,	"j",	"2+3.5j"
+2.5,		3.5,	"j",	"2.5+3.5j"
+3,		3.5,	"j",	"3+3.5j"
+3.5,		3.5,	"j",	"3.5+3.5j"
+-1.23,		-4.56,		"-1.23-4.56i"
+0,		-3.21,	"i",	"-3.21i"
+1.23,		-2.34,	"j",	"1.23-2.34j"
+-1.23,		0,		-1.23
+0,		0,	"i",	0
+1.23,		0,	"j",	1.23
+-1.23,		4.56,		"-1.23+4.56i"
+0,		3.21,	"i",	"3.21i"
+1.23,		2.34,	"j",	"1.23+2.34j"
diff --git a/unitTests/rawTestData/Calculation/Engineering/CONVERTUOM.data b/tests/rawTestData/Calculation/Engineering/CONVERTUOM.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/CONVERTUOM.data
rename to tests/rawTestData/Calculation/Engineering/CONVERTUOM.data
index 5cc8b38f..dbcfb011 100644
--- a/unitTests/rawTestData/Calculation/Engineering/CONVERTUOM.data
+++ b/tests/rawTestData/Calculation/Engineering/CONVERTUOM.data
@@ -1,24 +1,24 @@
-1.0,	"lbm",	"kg",	0.45359230974881
-123.45,	"kg",	"kg",	123.45
-68,	"F",	"C",	20
-20,	"C",	"F",	68
-68,	"F",	"K",	293.15
-293.15,	"K",	"F",	68
-22,	"C",	"K",	295.15
-295.65,	"K",	"C",	22.5
-2.5,	"ft",	"sec",	"#N/A"
-12345,	"m",	"km",	12.345
-12.345,	"km",	"m",	12345
-1,	"km",	"mi",	0.62137119223733
-"three","ft",	"yds",	"#VALUE!"
-123.45,	"K",	"kel",	123.45
-123.45,	"C",	"cel",	123.45
-123.45,	"F",	"fah",	123.45
-1,	"ft",	"day",	"#N/A"
-123.45,	"m",	"m",	123.45
-234.56,	"km",	"km",	234.56
-234.56,	"kpt",	"lt",	"#N/A"
-234.56,	"sm",	"m",	"#N/A"
-234.56,	"lt",	"kpt",	"#N/A"
-234.56,	"m",	"sm",	"#N/A"
-12.345,	"km",	"mm",	12345000
+1.0,	"lbm",	"kg",	0.45359230974881
+123.45,	"kg",	"kg",	123.45
+68,	"F",	"C",	20
+20,	"C",	"F",	68
+68,	"F",	"K",	293.15
+293.15,	"K",	"F",	68
+22,	"C",	"K",	295.15
+295.65,	"K",	"C",	22.5
+2.5,	"ft",	"sec",	"#N/A"
+12345,	"m",	"km",	12.345
+12.345,	"km",	"m",	12345
+1,	"km",	"mi",	0.62137119223733
+"three","ft",	"yds",	"#VALUE!"
+123.45,	"K",	"kel",	123.45
+123.45,	"C",	"cel",	123.45
+123.45,	"F",	"fah",	123.45
+1,	"ft",	"day",	"#N/A"
+123.45,	"m",	"m",	123.45
+234.56,	"km",	"km",	234.56
+234.56,	"kpt",	"lt",	"#N/A"
+234.56,	"sm",	"m",	"#N/A"
+234.56,	"lt",	"kpt",	"#N/A"
+234.56,	"m",	"sm",	"#N/A"
+12.345,	"km",	"mm",	12345000
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data b/tests/rawTestData/Calculation/Engineering/DEC2BIN.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data
rename to tests/rawTestData/Calculation/Engineering/DEC2BIN.data
index a93cadce..06287ead 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2BIN.data
+++ b/tests/rawTestData/Calculation/Engineering/DEC2BIN.data
@@ -1,18 +1,18 @@
-357,			"101100101"
-512,			"#NUM!"		//	Too large
--513,			"#NUM!"		//	Too small
-9,		4,	"1001"
-9,		8,	"00001001"
-9,		6.75,	"001001"	//	Leading places as a float
-9,		-1,	"#NUM!"		//	Leading places negative
-9,		"ABC",	"#VALUE!"	//	Leading places non-numeric
-246,			"11110110"
-12345,			"#NUM!"
-123456789,		"#NUM!"
-123.45,			"1111011"
-0,			"0"
-"3579A",		"#VALUE!"	//	Invalid decimal
-TRUE,			"#VALUE!"	//	Non string
--100,			"1110011100"	//	2's Complement
--107,			"1110010101"	//	2's Complement
--512,			"1000000000"	//	2's Complement
+357,			"101100101"
+512,			"#NUM!"		//	Too large
+-513,			"#NUM!"		//	Too small
+9,		4,	"1001"
+9,		8,	"00001001"
+9,		6.75,	"001001"	//	Leading places as a float
+9,		-1,	"#NUM!"		//	Leading places negative
+9,		"ABC",	"#VALUE!"	//	Leading places non-numeric
+246,			"11110110"
+12345,			"#NUM!"
+123456789,		"#NUM!"
+123.45,			"1111011"
+0,			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+-100,			"1110011100"	//	2's Complement
+-107,			"1110010101"	//	2's Complement
+-512,			"1000000000"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data b/tests/rawTestData/Calculation/Engineering/DEC2HEX.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data
rename to tests/rawTestData/Calculation/Engineering/DEC2HEX.data
index 1d2796cd..5210e915 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2HEX.data
+++ b/tests/rawTestData/Calculation/Engineering/DEC2HEX.data
@@ -1,15 +1,15 @@
-"357",			"165"
-"1357",			"54D"
-"246",			"F6"
-"12345",		"3039"
-"123456789",		"75BCD15"
-"100",		4,	"0064"
-"100",		5.75,	"00064"		//	Leading places as a float
-"100",		-1,	"#NUM!"		//	Leading places negative
-"100",		"ABC",	"#VALUE!"	//	Leading places non-numeric
-"123.45",		"7B"
-"0",			"0"
-"3579A",		"#VALUE!"	//	Invalid decimal
-TRUE,			"#VALUE!"	//	Non string
-"-54",			"FFFFFFFFCA"	//	2's Complement
-"-107",			"FFFFFFFF95"	//	2's Complement
+"357",			"165"
+"1357",			"54D"
+"246",			"F6"
+"12345",		"3039"
+"123456789",		"75BCD15"
+"100",		4,	"0064"
+"100",		5.75,	"00064"		//	Leading places as a float
+"100",		-1,	"#NUM!"		//	Leading places negative
+"100",		"ABC",	"#VALUE!"	//	Leading places non-numeric
+"123.45",		"7B"
+"0",			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+"-54",			"FFFFFFFFCA"	//	2's Complement
+"-107",			"FFFFFFFF95"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data b/tests/rawTestData/Calculation/Engineering/DEC2OCT.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
rename to tests/rawTestData/Calculation/Engineering/DEC2OCT.data
index bf82a171..400b8282 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
+++ b/tests/rawTestData/Calculation/Engineering/DEC2OCT.data
@@ -1,12 +1,12 @@
-"357",			"545"
-"1357",			"2515"
-"246",			"366"
-"12345",		"30071"
-"123456789",		"726746425"
-"123.45",		"173"
-"58",		3,	"072"
-"0",			"0"
-"3579A",		"#VALUE!"	//	Invalid decimal
-TRUE,			"#VALUE!"	//	Non string
-"-100",			"7777777634"	//	2's Complement
-"-107",			"7777777625"	//	2's Complement
+"357",			"545"
+"1357",			"2515"
+"246",			"366"
+"12345",		"30071"
+"123456789",		"726746425"
+"123.45",		"173"
+"58",		3,	"072"
+"0",			"0"
+"3579A",		"#VALUE!"	//	Invalid decimal
+TRUE,			"#VALUE!"	//	Non string
+"-100",			"7777777634"	//	2's Complement
+"-107",			"7777777625"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/DELTA.data b/tests/rawTestData/Calculation/Engineering/DELTA.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Engineering/DELTA.data
rename to tests/rawTestData/Calculation/Engineering/DELTA.data
index 6f1d4493..e994277b 100644
--- a/unitTests/rawTestData/Calculation/Engineering/DELTA.data
+++ b/tests/rawTestData/Calculation/Engineering/DELTA.data
@@ -1,25 +1,25 @@
--1.5,	-1.5,	1
--0.75,	-1.5,	0
-0,	-1.5,	0
-0.75,	-1.5,	0
-1.5,	-1.5,	0
--1.5,	-0.75,	0
--0.75,	-0.75,	1
-0,	-0.75,	0
-0.75,	-0.75,	0
-1.5,	-0.75,	0
--1.5,	0,	0
--0.75,	0,	0
-0,	0,	1
-0.75,	0,	0
-1.5,	0,	0
--1.5,	0.75,	0
--0.75,	0.75,	0
-0,	0.75,	0
-0.75,	0.75,	1
-1.5,	0.75,	0
--1.5,	1.5,	0
--0.75,	1.5,	0
-0,	1.5,	0
-0.75,	1.5,	0
-1.5,	1.5,	1
+-1.5,	-1.5,	1
+-0.75,	-1.5,	0
+0,	-1.5,	0
+0.75,	-1.5,	0
+1.5,	-1.5,	0
+-1.5,	-0.75,	0
+-0.75,	-0.75,	1
+0,	-0.75,	0
+0.75,	-0.75,	0
+1.5,	-0.75,	0
+-1.5,	0,	0
+-0.75,	0,	0
+0,	0,	1
+0.75,	0,	0
+1.5,	0,	0
+-1.5,	0.75,	0
+-0.75,	0.75,	0
+0,	0.75,	0
+0.75,	0.75,	1
+1.5,	0.75,	0
+-1.5,	1.5,	0
+-0.75,	1.5,	0
+0,	1.5,	0
+0.75,	1.5,	0
+1.5,	1.5,	1
diff --git a/unitTests/rawTestData/Calculation/Engineering/ERF.data b/tests/rawTestData/Calculation/Engineering/ERF.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/ERF.data
rename to tests/rawTestData/Calculation/Engineering/ERF.data
index d52cf32c..5c4fc1e9 100644
--- a/unitTests/rawTestData/Calculation/Engineering/ERF.data
+++ b/tests/rawTestData/Calculation/Engineering/ERF.data
@@ -1,124 +1,124 @@
-# lower	bound	upper bound	Result
-0,				0.0
-0.01,				0.0112834155558496
-0.05,				0.0563719777970166
-0.1,				0.1124629160182850
-0.125,				0.1403162048013340
-0.15,				0.1679959714273630
-0.2,				0.2227025892104780
-0.25,				0.2763263901682370
-0.3,				0.3286267594591270
-0.35,				0.3793820535623100
-0.4,				0.4283923550466680
-0.45,				0.4754817197869240
-0.5,				0.5204998778130470
-0.6,				0.6038560908479260
-0.7,				0.6778011938374180
-0.8,				0.7421009647076610
-0.9,				0.7969082124228320
-1,				0.8427007929497150
-1.1,				0.8802050695740820
-1.2,				0.9103139782296350
-1.3,				0.9340079449406520
-1.4,				0.9522851197626490
-1.5,				0.9661051464753110
-1.75,				0.9866716712191820
-2,				0.9953222650189530
-2.5,				0.9995930479825550
-3,				0.9999779095030010
-3.5,				0.9999992569016280
-4,				0.9999999845827420
-4.5,				0.9999999998033840
-5,				0.9999999999984630
-5.5,				0.9999999999999930
-6,				1.0
-32,				1.0
--0.1,				-0.1124629160182850
--1,				-0.8427007929497150
-TRUE,				"#VALUE!"
-FALSE,				"#VALUE!"
-"2",				0.9953222650189530
-"TWO",				"#VALUE!"
--1.5,		-1.5,		0.0
--0.75,		-1.5,		-0.2549495128217960
-0,		-1.5,		-0.9661051464753110
-0.75,		-1.5,		-1.6772607801288300
-1.5,		-1.5,		-1.9322102929506200
-2.25,		-1.5,		-1.9646424298886300
-3,		-1.5,		-1.9660830559783100
-3.75,		-1.5,		-1.9661050327480500
-4.5,		-1.5,		-1.9661051462786900
--1.5,		-0.75,		0.2549495128217960
--0.75,		-0.75,		0.0
-0,		-0.75,		-0.7111556336535150
-0.75,		-0.75,		-1.4223112673070300
-1.5,		-0.75,		-1.6772607801288300
-2.25,		-0.75,		-1.7096929170668300
-3,		-0.75,		-1.7111335431565200
-3.75,		-0.75,		-1.7111555199262600
-4.5,		-0.75,		-1.7111556334569000
--1.5,		0,		0.9661051464753110
--0.75,		0,		0.7111556336535150
-0,		0,		0.0
-0.75,		0,		-0.7111556336535150
-1.5,		0,		-0.9661051464753110
-2.25,		0,		-0.9985372834133190
-3,		0,		-0.9999779095030010
-3.75,		0,		-0.9999998862727430
-4.5,		0,		-0.9999999998033840
--1.5,		0.75,		1.6772607801288300
--0.75,		0.75,		1.4223112673070300
-0,		0.75,		0.7111556336535150
-0.75,		0.75,		0.0
-1.5,		0.75,		-0.2549495128217960
-2.25,		0.75,		-0.2873816497598040
-3,		0.75,		-0.2888222758494860
-3.75,		0.75,		-0.2888442526192280
-4.5,		0.75,		-0.2888443661498690
--1.5,		1.5,		1.9322102929506200
--0.75,		1.5,		1.6772607801288300
-0,		1.5,		0.9661051464753110
-0.75,		1.5,		0.2549495128217960
-1.5,		1.5,		0.0
-2.25,		1.5,		-0.0324321369380081
-3,		1.5,		-0.0338727630276906
-3.75,		1.5,		-0.0338947397974326
-4.5,		1.5,		-0.0338948533280732
--1.5,		2.25,		1.9646424298886300
--0.75,		2.25,		1.7096929170668300
-0,		2.25,		0.9985372834133190
-0.75,		2.25,		0.2873816497598040
-1.5,		2.25,		0.0324321369380081
-2.25,		2.25,		0.0
-3,		2.25,		-0.0014406260896825
-3.75,		2.25,		-0.0014626028594246
-4.5,		2.25,		-0.0014627163900651
--1.5,		3,		1.9660830559783100
--0.75,		3,		1.7111335431565200
-0,		3,		0.9999779095030010
-0.75,		3,		0.2888222758494860
-1.5,		3,		0.0338727630276906
-2.25,		3,		0.0014406260896825
-3,		3,		0.0
-3.75,		3,		-0.0000219767697420
-4.5,		3,		-0.0000220903003826
--1.5,		3.75,		1.9661050327480500
--0.75,		3.75,		1.7111555199262600
-0,		3.75,		0.9999998862727430
-0.75,		3.75,		0.2888442526192280
-1.5,		3.75,		0.0338947397974326
-2.25,		3.75,		0.0014626028594246
-3,		3.75,		0.0000219767697420
-3.75,		3.75,		0.0
-4.5,		3.75,		-0.0000001135306406
--1.5,		4.5,		1.9661051462786900
--0.75,		4.5,		1.7111556334569000
-0,		4.5,		0.9999999998033840
-0.75,		4.5,		0.2888443661498690
-1.5,		4.5,		0.0338948533280732
-2.25,		4.5,		0.0014627163900651
-3,		4.5,		0.0000220903003826
-3.75,		4.5,		0.0000001135306406
-4.5,		4.5,		0.0
-5,		-1,		-1.8427007929481800
--5,		1,		1.8427007929481800
+# lower	bound	upper bound	Result
+0,				0.0
+0.01,				0.0112834155558496
+0.05,				0.0563719777970166
+0.1,				0.1124629160182850
+0.125,				0.1403162048013340
+0.15,				0.1679959714273630
+0.2,				0.2227025892104780
+0.25,				0.2763263901682370
+0.3,				0.3286267594591270
+0.35,				0.3793820535623100
+0.4,				0.4283923550466680
+0.45,				0.4754817197869240
+0.5,				0.5204998778130470
+0.6,				0.6038560908479260
+0.7,				0.6778011938374180
+0.8,				0.7421009647076610
+0.9,				0.7969082124228320
+1,				0.8427007929497150
+1.1,				0.8802050695740820
+1.2,				0.9103139782296350
+1.3,				0.9340079449406520
+1.4,				0.9522851197626490
+1.5,				0.9661051464753110
+1.75,				0.9866716712191820
+2,				0.9953222650189530
+2.5,				0.9995930479825550
+3,				0.9999779095030010
+3.5,				0.9999992569016280
+4,				0.9999999845827420
+4.5,				0.9999999998033840
+5,				0.9999999999984630
+5.5,				0.9999999999999930
+6,				1.0
+32,				1.0
+-0.1,				-0.1124629160182850
+-1,				-0.8427007929497150
+TRUE,				"#VALUE!"
+FALSE,				"#VALUE!"
+"2",				0.9953222650189530
+"TWO",				"#VALUE!"
+-1.5,		-1.5,		0.0
+-0.75,		-1.5,		-0.2549495128217960
+0,		-1.5,		-0.9661051464753110
+0.75,		-1.5,		-1.6772607801288300
+1.5,		-1.5,		-1.9322102929506200
+2.25,		-1.5,		-1.9646424298886300
+3,		-1.5,		-1.9660830559783100
+3.75,		-1.5,		-1.9661050327480500
+4.5,		-1.5,		-1.9661051462786900
+-1.5,		-0.75,		0.2549495128217960
+-0.75,		-0.75,		0.0
+0,		-0.75,		-0.7111556336535150
+0.75,		-0.75,		-1.4223112673070300
+1.5,		-0.75,		-1.6772607801288300
+2.25,		-0.75,		-1.7096929170668300
+3,		-0.75,		-1.7111335431565200
+3.75,		-0.75,		-1.7111555199262600
+4.5,		-0.75,		-1.7111556334569000
+-1.5,		0,		0.9661051464753110
+-0.75,		0,		0.7111556336535150
+0,		0,		0.0
+0.75,		0,		-0.7111556336535150
+1.5,		0,		-0.9661051464753110
+2.25,		0,		-0.9985372834133190
+3,		0,		-0.9999779095030010
+3.75,		0,		-0.9999998862727430
+4.5,		0,		-0.9999999998033840
+-1.5,		0.75,		1.6772607801288300
+-0.75,		0.75,		1.4223112673070300
+0,		0.75,		0.7111556336535150
+0.75,		0.75,		0.0
+1.5,		0.75,		-0.2549495128217960
+2.25,		0.75,		-0.2873816497598040
+3,		0.75,		-0.2888222758494860
+3.75,		0.75,		-0.2888442526192280
+4.5,		0.75,		-0.2888443661498690
+-1.5,		1.5,		1.9322102929506200
+-0.75,		1.5,		1.6772607801288300
+0,		1.5,		0.9661051464753110
+0.75,		1.5,		0.2549495128217960
+1.5,		1.5,		0.0
+2.25,		1.5,		-0.0324321369380081
+3,		1.5,		-0.0338727630276906
+3.75,		1.5,		-0.0338947397974326
+4.5,		1.5,		-0.0338948533280732
+-1.5,		2.25,		1.9646424298886300
+-0.75,		2.25,		1.7096929170668300
+0,		2.25,		0.9985372834133190
+0.75,		2.25,		0.2873816497598040
+1.5,		2.25,		0.0324321369380081
+2.25,		2.25,		0.0
+3,		2.25,		-0.0014406260896825
+3.75,		2.25,		-0.0014626028594246
+4.5,		2.25,		-0.0014627163900651
+-1.5,		3,		1.9660830559783100
+-0.75,		3,		1.7111335431565200
+0,		3,		0.9999779095030010
+0.75,		3,		0.2888222758494860
+1.5,		3,		0.0338727630276906
+2.25,		3,		0.0014406260896825
+3,		3,		0.0
+3.75,		3,		-0.0000219767697420
+4.5,		3,		-0.0000220903003826
+-1.5,		3.75,		1.9661050327480500
+-0.75,		3.75,		1.7111555199262600
+0,		3.75,		0.9999998862727430
+0.75,		3.75,		0.2888442526192280
+1.5,		3.75,		0.0338947397974326
+2.25,		3.75,		0.0014626028594246
+3,		3.75,		0.0000219767697420
+3.75,		3.75,		0.0
+4.5,		3.75,		-0.0000001135306406
+-1.5,		4.5,		1.9661051462786900
+-0.75,		4.5,		1.7111556334569000
+0,		4.5,		0.9999999998033840
+0.75,		4.5,		0.2888443661498690
+1.5,		4.5,		0.0338948533280732
+2.25,		4.5,		0.0014627163900651
+3,		4.5,		0.0000220903003826
+3.75,		4.5,		0.0000001135306406
+4.5,		4.5,		0.0
+5,		-1,		-1.8427007929481800
+-5,		1,		1.8427007929481800
diff --git a/unitTests/rawTestData/Calculation/Engineering/ERFC.data b/tests/rawTestData/Calculation/Engineering/ERFC.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/ERFC.data
rename to tests/rawTestData/Calculation/Engineering/ERFC.data
index 3cdc3d5b..df814893 100644
--- a/unitTests/rawTestData/Calculation/Engineering/ERFC.data
+++ b/tests/rawTestData/Calculation/Engineering/ERFC.data
@@ -1,41 +1,41 @@
-# x value	Result
-0,		1.0
-0.01,		0.9887165844441500
-0.05,		0.9436280222029830
-0.1,		0.8875370839817150
-0.125,		0.8596837951986660
-0.15,		0.8320040285726360
-0.2,		0.7772974107895220
-0.25,		0.7236736098317630
-0.3,		0.6713732405408730
-0.35,		0.6206179464376900
-0.4,		0.5716076449533320
-0.45,		0.5245182802130760
-0.5,		0.4795001221869530
-0.6,		0.3961439091520740
-0.7,		0.3221988061625820
-0.8,		0.2578990352923390
-0.9,		0.2030917875771680
-1,		0.1572992070502850
-1.1,		0.1197949304259180
-1.2,		0.0896860217703646
-1.3,		0.0659920550593475
-1.4,		0.0477148802373512
-1.5,		0.0338948535246893
-1.75,		0.0133283287808176
-2,		0.0046777349810473
-2.5,		0.0004069520174450
-3,		0.0000220904969986
-3.5,		0.0000007430983723
-4,		0.0000000154172579
-4.5,		0.0000000001966160
-5,		0.0000000000015375
-5.5,		0.0000000000000074
-6,		0.0
-32,		0.0
--0.1,		1.1124629160182900
--1,		1.8427007929497100
-TRUE,		"#VALUE!"
-FALSE,		"#VALUE!"
-"2",		0.0046777349810473
-"TWO",		"#VALUE!"
+# x value	Result
+0,		1.0
+0.01,		0.9887165844441500
+0.05,		0.9436280222029830
+0.1,		0.8875370839817150
+0.125,		0.8596837951986660
+0.15,		0.8320040285726360
+0.2,		0.7772974107895220
+0.25,		0.7236736098317630
+0.3,		0.6713732405408730
+0.35,		0.6206179464376900
+0.4,		0.5716076449533320
+0.45,		0.5245182802130760
+0.5,		0.4795001221869530
+0.6,		0.3961439091520740
+0.7,		0.3221988061625820
+0.8,		0.2578990352923390
+0.9,		0.2030917875771680
+1,		0.1572992070502850
+1.1,		0.1197949304259180
+1.2,		0.0896860217703646
+1.3,		0.0659920550593475
+1.4,		0.0477148802373512
+1.5,		0.0338948535246893
+1.75,		0.0133283287808176
+2,		0.0046777349810473
+2.5,		0.0004069520174450
+3,		0.0000220904969986
+3.5,		0.0000007430983723
+4,		0.0000000154172579
+4.5,		0.0000000001966160
+5,		0.0000000000015375
+5.5,		0.0000000000000074
+6,		0.0
+32,		0.0
+-0.1,		1.1124629160182900
+-1,		1.8427007929497100
+TRUE,		"#VALUE!"
+FALSE,		"#VALUE!"
+"2",		0.0046777349810473
+"TWO",		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Engineering/GESTEP.data b/tests/rawTestData/Calculation/Engineering/GESTEP.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Engineering/GESTEP.data
rename to tests/rawTestData/Calculation/Engineering/GESTEP.data
index 9b77a8ea..f6bf40ea 100644
--- a/unitTests/rawTestData/Calculation/Engineering/GESTEP.data
+++ b/tests/rawTestData/Calculation/Engineering/GESTEP.data
@@ -1,81 +1,81 @@
--1.5,	-1.5,	1
--0.75,	-1.5,	1
-0,	-1.5,	1
-0.75,	-1.5,	1
-1.5,	-1.5,	1
-2.25,	-1.5,	1
-3,	-1.5,	1
-3.75,	-1.5,	1
-4.5,	-1.5,	1
--1.5,	-0.75,	0
--0.75,	-0.75,	1
-0,	-0.75,	1
-0.75,	-0.75,	1
-1.5,	-0.75,	1
-2.25,	-0.75,	1
-3,	-0.75,	1
-3.75,	-0.75,	1
-4.5,	-0.75,	1
--1.5,	0,	0
--0.75,	0,	0
-0,	0,	1
-0.75,	0,	1
-1.5,	0,	1
-2.25,	0,	1
-3,	0,	1
-3.75,	0,	1
-4.5,	0,	1
--1.5,	0.75,	0
--0.75,	0.75,	0
-0,	0.75,	0
-0.75,	0.75,	1
-1.5,	0.75,	1
-2.25,	0.75,	1
-3,	0.75,	1
-3.75,	0.75,	1
-4.5,	0.75,	1
--1.5,	1.5,	0
--0.75,	1.5,	0
-0,	1.5,	0
-0.75,	1.5,	0
-1.5,	1.5,	1
-2.25,	1.5,	1
-3,	1.5,	1
-3.75,	1.5,	1
-4.5,	1.5,	1
--1.5,	2.25,	0
--0.75,	2.25,	0
-0,	2.25,	0
-0.75,	2.25,	0
-1.5,	2.25,	0
-2.25,	2.25,	1
-3,	2.25,	1
-3.75,	2.25,	1
-4.5,	2.25,	1
--1.5,	3,	0
--0.75,	3,	0
-0,	3,	0
-0.75,	3,	0
-1.5,	3,	0
-2.25,	3,	0
-3,	3,	1
-3.75,	3,	1
-4.5,	3,	1
--1.5,	3.75,	0
--0.75,	3.75,	0
-0,	3.75,	0
-0.75,	3.75,	0
-1.5,	3.75,	0
-2.25,	3.75,	0
-3,	3.75,	0
-3.75,	3.75,	1
-4.5,	3.75,	1
--1.5,	4.5,	0
--0.75,	4.5,	0
-0,	4.5,	0
-0.75,	4.5,	0
-1.5,	4.5,	0
-2.25,	4.5,	0
-3,	4.5,	0
-3.75,	4.5,	0
-4.5,	4.5,	1
+-1.5,	-1.5,	1
+-0.75,	-1.5,	1
+0,	-1.5,	1
+0.75,	-1.5,	1
+1.5,	-1.5,	1
+2.25,	-1.5,	1
+3,	-1.5,	1
+3.75,	-1.5,	1
+4.5,	-1.5,	1
+-1.5,	-0.75,	0
+-0.75,	-0.75,	1
+0,	-0.75,	1
+0.75,	-0.75,	1
+1.5,	-0.75,	1
+2.25,	-0.75,	1
+3,	-0.75,	1
+3.75,	-0.75,	1
+4.5,	-0.75,	1
+-1.5,	0,	0
+-0.75,	0,	0
+0,	0,	1
+0.75,	0,	1
+1.5,	0,	1
+2.25,	0,	1
+3,	0,	1
+3.75,	0,	1
+4.5,	0,	1
+-1.5,	0.75,	0
+-0.75,	0.75,	0
+0,	0.75,	0
+0.75,	0.75,	1
+1.5,	0.75,	1
+2.25,	0.75,	1
+3,	0.75,	1
+3.75,	0.75,	1
+4.5,	0.75,	1
+-1.5,	1.5,	0
+-0.75,	1.5,	0
+0,	1.5,	0
+0.75,	1.5,	0
+1.5,	1.5,	1
+2.25,	1.5,	1
+3,	1.5,	1
+3.75,	1.5,	1
+4.5,	1.5,	1
+-1.5,	2.25,	0
+-0.75,	2.25,	0
+0,	2.25,	0
+0.75,	2.25,	0
+1.5,	2.25,	0
+2.25,	2.25,	1
+3,	2.25,	1
+3.75,	2.25,	1
+4.5,	2.25,	1
+-1.5,	3,	0
+-0.75,	3,	0
+0,	3,	0
+0.75,	3,	0
+1.5,	3,	0
+2.25,	3,	0
+3,	3,	1
+3.75,	3,	1
+4.5,	3,	1
+-1.5,	3.75,	0
+-0.75,	3.75,	0
+0,	3.75,	0
+0.75,	3.75,	0
+1.5,	3.75,	0
+2.25,	3.75,	0
+3,	3.75,	0
+3.75,	3.75,	1
+4.5,	3.75,	1
+-1.5,	4.5,	0
+-0.75,	4.5,	0
+0,	4.5,	0
+0.75,	4.5,	0
+1.5,	4.5,	0
+2.25,	4.5,	0
+3,	4.5,	0
+3.75,	4.5,	0
+4.5,	4.5,	1
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data b/tests/rawTestData/Calculation/Engineering/HEX2BIN.data
similarity index 91%
rename from unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data
rename to tests/rawTestData/Calculation/Engineering/HEX2BIN.data
index e0e91707..a37c51b8 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2BIN.data
+++ b/tests/rawTestData/Calculation/Engineering/HEX2BIN.data
@@ -1,17 +1,17 @@
-"FF",		"11111111"
-"1FF",		"111111111"
-"200",		"#NUM!"
-"FFFFFFFE00",		"1000000000" 	//	2's Complement
-"FFFFFFFDFF",		"#NUM!"	        //	2's Complement
-"01AB",			"110101011"
-"ABCD",			"#NUM!"
-"F6",			"11110110"
-"F",		8,	"00001111"
-"B7",			"10110111"
-"12345",		"#NUM!"
-"123456789",		"#NUM!"
-"123.45",		"#NUM!"
-"0",			"0"
-"G3579A",		"#NUM!"
-TRUE,			"#VALUE!"
+"FF",		"11111111"
+"1FF",		"111111111"
+"200",		"#NUM!"
+"FFFFFFFE00",		"1000000000" 	//	2's Complement
+"FFFFFFFDFF",		"#NUM!"	        //	2's Complement
+"01AB",			"110101011"
+"ABCD",			"#NUM!"
+"F6",			"11110110"
+"F",		8,	"00001111"
+"B7",			"10110111"
+"12345",		"#NUM!"
+"123456789",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+"G3579A",		"#NUM!"
+TRUE,			"#VALUE!"
 "-107",			"#NUM!"
\ No newline at end of file
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data b/tests/rawTestData/Calculation/Engineering/HEX2DEC.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data
rename to tests/rawTestData/Calculation/Engineering/HEX2DEC.data
index 45bfddf1..863fd53e 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2DEC.data
+++ b/tests/rawTestData/Calculation/Engineering/HEX2DEC.data
@@ -1,15 +1,15 @@
-"01AB",		"427"
-"ABCD",		"43981"
-"F6",		"246"
-"12345",	"74565"
-"123456789",	"4886718345"
-"123.45",	"#NUM!"
-"0",		"0"
-"G3579A",	"#NUM!"
-TRUE,		"#VALUE!"
-"-107",		"#NUM!"
-"A5",		"165"
-"3DA408B9",	"1034160313"
-"FFFFFFFF5B",	"-165"   //	2's Complement
-"FFFFFFFFFF",	"-1"     //	2's Complement
-"1FFFFFFFFFF",	"#NUM!"  // Too large
+"01AB",		"427"
+"ABCD",		"43981"
+"F6",		"246"
+"12345",	"74565"
+"123456789",	"4886718345"
+"123.45",	"#NUM!"
+"0",		"0"
+"G3579A",	"#NUM!"
+TRUE,		"#VALUE!"
+"-107",		"#NUM!"
+"A5",		"165"
+"3DA408B9",	"1034160313"
+"FFFFFFFF5B",	"-165"   //	2's Complement
+"FFFFFFFFFF",	"-1"     //	2's Complement
+"1FFFFFFFFFF",	"#NUM!"  // Too large
diff --git a/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data b/tests/rawTestData/Calculation/Engineering/HEX2OCT.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data
rename to tests/rawTestData/Calculation/Engineering/HEX2OCT.data
index 2ab2786a..2ebd893a 100644
--- a/unitTests/rawTestData/Calculation/Engineering/HEX2OCT.data
+++ b/tests/rawTestData/Calculation/Engineering/HEX2OCT.data
@@ -1,13 +1,13 @@
-"01AB",			"653"
-"ABCD",			"125715"
-"F6",			"366"
-"3B4E",			"35516"
-"F",		3,	"017"
-"12345",		"221505"
-"123456789",		"#NUM!"
-"123.45",		"#NUM!"
-"0",			"0"
-"G3579A",		"#NUM!"
-TRUE,			"#VALUE!"
-"-107",			"#NUM!"
-"FFFFFFFF00",		"7777777400"	//	2's Complement
+"01AB",			"653"
+"ABCD",			"125715"
+"F6",			"366"
+"3B4E",			"35516"
+"F",		3,	"017"
+"12345",		"221505"
+"123456789",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+"G3579A",		"#NUM!"
+TRUE,			"#VALUE!"
+"-107",			"#NUM!"
+"FFFFFFFF00",		"7777777400"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMABS.data b/tests/rawTestData/Calculation/Engineering/IMABS.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/IMABS.data
rename to tests/rawTestData/Calculation/Engineering/IMABS.data
index 9de11d10..e92de41b 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMABS.data
+++ b/tests/rawTestData/Calculation/Engineering/IMABS.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",		13.580298229420
-"1.234E-5+6.78E9i",	6.78E9
-"3.5+2.5i",		4.301162633521
-"3.5+i",		3.640054944640
-"3.5",			3.5
-"3.5-i",		3.640054944640
-"3.5-2.5i",		4.301162633521
-"1+2.5i",		2.692582403567
-"1+i",			1.414213562373
-"1",			1
-"1-i",			1.414213562373
-"1-2.5i",		2.692582403567
-"2.5i",			2.5
-"i",			1
-"0",			0
-"-i",			1
-"-2.5i",		2.5
-"-1+2.5i",		2.692582403567
-"-1+i",			1.414213562373
-"-1",			1
-"-1-i",			1.414213562373
-"-1-2.5i",		2.692582403567
-"-3.5+2.5i",		4.301162633521
-"-3.5+i",		3.640054944640
-"-3.5",			3.5
-"-3.5-i",		3.640054944640
-"-3.5-2.5i",		4.301162633521
+"12.34+5.67j",		13.580298229420
+"1.234E-5+6.78E9i",	6.78E9
+"3.5+2.5i",		4.301162633521
+"3.5+i",		3.640054944640
+"3.5",			3.5
+"3.5-i",		3.640054944640
+"3.5-2.5i",		4.301162633521
+"1+2.5i",		2.692582403567
+"1+i",			1.414213562373
+"1",			1
+"1-i",			1.414213562373
+"1-2.5i",		2.692582403567
+"2.5i",			2.5
+"i",			1
+"0",			0
+"-i",			1
+"-2.5i",		2.5
+"-1+2.5i",		2.692582403567
+"-1+i",			1.414213562373
+"-1",			1
+"-1-i",			1.414213562373
+"-1-2.5i",		2.692582403567
+"-3.5+2.5i",		4.301162633521
+"-3.5+i",		3.640054944640
+"-3.5",			3.5
+"-3.5-i",		3.640054944640
+"-3.5-2.5i",		4.301162633521
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMAGINARY.data b/tests/rawTestData/Calculation/Engineering/IMAGINARY.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/Engineering/IMAGINARY.data
rename to tests/rawTestData/Calculation/Engineering/IMAGINARY.data
index 85e64f27..ac888bae 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMAGINARY.data
+++ b/tests/rawTestData/Calculation/Engineering/IMAGINARY.data
@@ -1,30 +1,30 @@
-"12.34+5.67j",		5.67
-"1.234E-5+6.78E9i",	6.78E9
-"3.5+2.5i",		2.5
-"3.5+i",		1
-"3.5",			0
-"3.5-i",		-1
-"3.5-2.5i",		-2.5
-"1+2.5i",		2.5
-"1+i",			1
-"1",			0
-1,			0
-"1-i",			-1
-"1-2.5i",		-2.5
-"2.5i",			2.5
-"i",			1
-"0",			0
-0,			0
-0.0,			0
-"-i",			-1
-"-2.5i",		-2.5
-"-1+2.5i",		2.5
-"-1+i",			1
-"-1",			0
-"-1-i",			-1
-"-1-2.5i",		-2.5
-"-3.5+2.5i",		2.5
-"-3.5+i",		1
-"-3.5",			0
-"-3.5-i",		-1
-"-3.5-2.5i",		-2.5
+"12.34+5.67j",		5.67
+"1.234E-5+6.78E9i",	6.78E9
+"3.5+2.5i",		2.5
+"3.5+i",		1
+"3.5",			0
+"3.5-i",		-1
+"3.5-2.5i",		-2.5
+"1+2.5i",		2.5
+"1+i",			1
+"1",			0
+1,			0
+"1-i",			-1
+"1-2.5i",		-2.5
+"2.5i",			2.5
+"i",			1
+"0",			0
+0,			0
+0.0,			0
+"-i",			-1
+"-2.5i",		-2.5
+"-1+2.5i",		2.5
+"-1+i",			1
+"-1",			0
+"-1-i",			-1
+"-1-2.5i",		-2.5
+"-3.5+2.5i",		2.5
+"-3.5+i",		1
+"-3.5",			0
+"-3.5-i",		-1
+"-3.5-2.5i",		-2.5
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMARGUMENT.data b/tests/rawTestData/Calculation/Engineering/IMARGUMENT.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/IMARGUMENT.data
rename to tests/rawTestData/Calculation/Engineering/IMARGUMENT.data
index 21cd497f..4b11d998 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMARGUMENT.data
+++ b/tests/rawTestData/Calculation/Engineering/IMARGUMENT.data
@@ -1,26 +1,26 @@
-"12.34+5.67j",	0.430710595550
-"3.5+2.5i",	0.620249485983
-"3.5+i",	0.278299659005
-"3.5",		0
-"3.5-i",	-0.278299659005
-"3.5-2.5i",	-0.620249485983
-"1+2.5i",	1.190289949683
-"1+i",		0.785398163397
-"1",		0
-"1-i",		-0.785398163397
-"1-2.5i",	-1.190289949683
-"2.5i",		1.570796326795
-"i",		1.570796326795
-"0",		"#DIV/0!"
-"-i",		-1.570796326795
-"-2.5i",	-1.570796326795
-"-1+2.5i",	1.951302703907
-"-1+i",		2.356194490192
-"-1",		3.141592653590
-"-1-i",		-2.356194490192
-"-1-2.5i",	-1.951302703907
-"-3.5+2.5i",	2.521343167607
-"-3.5+i",	2.863292994585
-"-3.5",		3.141592653590
-"-3.5-i",	-2.863292994585
-"-3.5-2.5i",	-2.521343167607
+"12.34+5.67j",	0.430710595550
+"3.5+2.5i",	0.620249485983
+"3.5+i",	0.278299659005
+"3.5",		0
+"3.5-i",	-0.278299659005
+"3.5-2.5i",	-0.620249485983
+"1+2.5i",	1.190289949683
+"1+i",		0.785398163397
+"1",		0
+"1-i",		-0.785398163397
+"1-2.5i",	-1.190289949683
+"2.5i",		1.570796326795
+"i",		1.570796326795
+"0",		"#DIV/0!"
+"-i",		-1.570796326795
+"-2.5i",	-1.570796326795
+"-1+2.5i",	1.951302703907
+"-1+i",		2.356194490192
+"-1",		3.141592653590
+"-1-i",		-2.356194490192
+"-1-2.5i",	-1.951302703907
+"-3.5+2.5i",	2.521343167607
+"-3.5+i",	2.863292994585
+"-3.5",		3.141592653590
+"-3.5-i",	-2.863292994585
+"-3.5-2.5i",	-2.521343167607
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMCONJUGATE.data b/tests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
rename to tests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
index 9dc5f2b4..67eb96ff 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
+++ b/tests/rawTestData/Calculation/Engineering/IMCONJUGATE.data
@@ -1,26 +1,26 @@
-"12.34+5.67j",	"12.34-5.67j"
-"3.5+2.5i",	"3.5-2.5i"
-"3.5+i",	"3.5-i"
-"3.5",		"3.5"
-"3.5-i",	"3.5+i"
-"3.5-2.5i",	"3.5+2.5i"
-"1+2.5i",	"1-2.5i"
-"1+i",		"1-i"
-"1",		"1"
-"1-i",		"1+i"
-"1-2.5i",	"1+2.5i"
-"2.5i",		"-2.5i"
-"i",		"-i"
-"0",		"0"
-"-i",		"i"
-"-2.5i",	"2.5i"
-"-1+2.5i",	"-1-2.5i"
-"-1+i",		"-1-i"
-"-1",		"-1"
-"-1-i",		"-1+i"
-"-1-2.5i",	"-1+2.5i"
-"-3.5+2.5i",	"-3.5-2.5i"
-"-3.5+i",	"-3.5-i"
-"-3.5",		"-3.5"
-"-3.5-i",	"-3.5+i"
-"-3.5-2.5i",	"-3.5+2.5i"
+"12.34+5.67j",	"12.34-5.67j"
+"3.5+2.5i",	"3.5-2.5i"
+"3.5+i",	"3.5-i"
+"3.5",		"3.5"
+"3.5-i",	"3.5+i"
+"3.5-2.5i",	"3.5+2.5i"
+"1+2.5i",	"1-2.5i"
+"1+i",		"1-i"
+"1",		"1"
+"1-i",		"1+i"
+"1-2.5i",	"1+2.5i"
+"2.5i",		"-2.5i"
+"i",		"-i"
+"0",		"0"
+"-i",		"i"
+"-2.5i",	"2.5i"
+"-1+2.5i",	"-1-2.5i"
+"-1+i",		"-1-i"
+"-1",		"-1"
+"-1-i",		"-1+i"
+"-1-2.5i",	"-1+2.5i"
+"-3.5+2.5i",	"-3.5-2.5i"
+"-3.5+i",	"-3.5-i"
+"-3.5",		"-3.5"
+"-3.5-i",	"-3.5+i"
+"-3.5-2.5i",	"-3.5+2.5i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMCOS.data b/tests/rawTestData/Calculation/Engineering/IMCOS.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMCOS.data
rename to tests/rawTestData/Calculation/Engineering/IMCOS.data
index 4f00d2ef..7ada86ea 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMCOS.data
+++ b/tests/rawTestData/Calculation/Engineering/IMCOS.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",	"141.319179436356+32.547610312508j"
-"3.5+2.5i",	"-5.74262349163406+2.12231025604134i"
-"3.5+i",	"-1.44502817950166+0.412240867891067i"
-"3.5",		"-0.936456687290796"
-"3.5-i",	"-1.44502817950166-0.412240867891067i"
-"3.5-2.5i",	"-5.74262349163406-2.12231025604134i"
-"1+2.5i",	"3.31329014611322-5.0910715229497i"
-"1+i",		"0.833730025131149-0.988897705762865i"
-"1",		"0.54030230586814"
-"1-i",		"0.833730025131149+0.988897705762865i"
-"1-2.5i",	"3.31329014611322+5.0910715229497i"
-"2.5i",		"6.13228947966369"
-"i",		"1.54308063481524"
-"0",		"1"
-"-i",		"1.54308063481524"
-"-2.5i",	"6.13228947966369"
-"-1+2.5i",	"3.31329014611322+5.0910715229497i"
-"-1+i",		"0.833730025131149+0.988897705762865i"
-"-1",		"0.54030230586814"
-"-1-i",		"0.833730025131149-0.988897705762865i"
-"-1-2.5i",	"3.31329014611322-5.0910715229497i"
-"-3.5+2.5i",	"-5.74262349163406-2.12231025604134i"
-"-3.5+i",	"-1.44502817950166-0.412240867891067i"
-"-3.5",		"-0.936456687290796"
-"-3.5-i",	"-1.44502817950166+0.412240867891067i"
-"-3.5-2.5i",	"-5.74262349163406+2.12231025604134i"
-"3",		"-0.989992496600445"
+"12.34+5.67j",	"141.319179436356+32.547610312508j"
+"3.5+2.5i",	"-5.74262349163406+2.12231025604134i"
+"3.5+i",	"-1.44502817950166+0.412240867891067i"
+"3.5",		"-0.936456687290796"
+"3.5-i",	"-1.44502817950166-0.412240867891067i"
+"3.5-2.5i",	"-5.74262349163406-2.12231025604134i"
+"1+2.5i",	"3.31329014611322-5.0910715229497i"
+"1+i",		"0.833730025131149-0.988897705762865i"
+"1",		"0.54030230586814"
+"1-i",		"0.833730025131149+0.988897705762865i"
+"1-2.5i",	"3.31329014611322+5.0910715229497i"
+"2.5i",		"6.13228947966369"
+"i",		"1.54308063481524"
+"0",		"1"
+"-i",		"1.54308063481524"
+"-2.5i",	"6.13228947966369"
+"-1+2.5i",	"3.31329014611322+5.0910715229497i"
+"-1+i",		"0.833730025131149+0.988897705762865i"
+"-1",		"0.54030230586814"
+"-1-i",		"0.833730025131149-0.988897705762865i"
+"-1-2.5i",	"3.31329014611322-5.0910715229497i"
+"-3.5+2.5i",	"-5.74262349163406-2.12231025604134i"
+"-3.5+i",	"-1.44502817950166-0.412240867891067i"
+"-3.5",		"-0.936456687290796"
+"-3.5-i",	"-1.44502817950166+0.412240867891067i"
+"-3.5-2.5i",	"-5.74262349163406+2.12231025604134i"
+"3",		"-0.989992496600445"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMDIV.data b/tests/rawTestData/Calculation/Engineering/IMDIV.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Engineering/IMDIV.data
rename to tests/rawTestData/Calculation/Engineering/IMDIV.data
index f7a6991a..52d5cbb6 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMDIV.data
+++ b/tests/rawTestData/Calculation/Engineering/IMDIV.data
@@ -1,20 +1,20 @@
-"12.34+5.67j",	"123.45+67.89i",	"#NUM!"
-"12.34+5.67j",	"123.45+67.89j",	"0.0961415519586104-0.00694248653276682j"
-"-12.34+5.67i",	"-123.45+67.89i",	"0.0961415519586104+0.00694248653276682i"
-"-12.34-5.67i",	"-123.45+67.89i",	"0.0573549954111941+0.0774712890924744i"
-"-12.34+5.67i",	"-123.45-67.89i",	"0.0573549954111941-0.0774712890924744i"
-"-12.34-5.67i",	"-123.45-67.89i",	"0.0961415519586104-0.00694248653276682i"
-"12.34+5.67i",	"-123.45+67.89i",	"-0.0573549954111941-0.0774712890924744i"
-"12.34-5.67i",	"-123.45+67.89i",	"-0.0961415519586104-0.00694248653276682i"
-"12.34+5.67i",	"-123.45-67.89i",	"-0.0961415519586104+0.00694248653276682i"
-"12.34-5.67i",	"-123.45-67.89i",	"-0.0573549954111941+0.0774712890924744i"
-"-12.34+5.67i",	"123.45+67.89i",	"-0.0573549954111941+0.0774712890924744i"
-"-12.34-5.67i",	"123.45+67.89i",	"-0.0961415519586104+0.00694248653276682i"
-"-12.34+5.67i",	"123.45-67.89i",	"-0.0961415519586104-0.00694248653276682i"
-"-12.34-5.67i",	"123.45-67.89i",	"-0.0573549954111941-0.0774712890924744i"
-"-12.34-5.67i",	"123.45-67.89",		"#NUM!"
-"-12.34-5.67j",	"123.45-67.89",		"#NUM!"
-"-12.34-5.67",	"123.45-67.89j",	"#NUM!"
-"-12.34-5.67i",	"-12.34-5.67i",		"1"
-"-12.34",	"123.45-67.89i",	"-0.0767482736849023-0.0422068878126206i"
-"-12.34-5.67i",	"-12.34",		"1+0.459481361426256i"
+"12.34+5.67j",	"123.45+67.89i",	"#NUM!"
+"12.34+5.67j",	"123.45+67.89j",	"0.0961415519586104-0.00694248653276682j"
+"-12.34+5.67i",	"-123.45+67.89i",	"0.0961415519586104+0.00694248653276682i"
+"-12.34-5.67i",	"-123.45+67.89i",	"0.0573549954111941+0.0774712890924744i"
+"-12.34+5.67i",	"-123.45-67.89i",	"0.0573549954111941-0.0774712890924744i"
+"-12.34-5.67i",	"-123.45-67.89i",	"0.0961415519586104-0.00694248653276682i"
+"12.34+5.67i",	"-123.45+67.89i",	"-0.0573549954111941-0.0774712890924744i"
+"12.34-5.67i",	"-123.45+67.89i",	"-0.0961415519586104-0.00694248653276682i"
+"12.34+5.67i",	"-123.45-67.89i",	"-0.0961415519586104+0.00694248653276682i"
+"12.34-5.67i",	"-123.45-67.89i",	"-0.0573549954111941+0.0774712890924744i"
+"-12.34+5.67i",	"123.45+67.89i",	"-0.0573549954111941+0.0774712890924744i"
+"-12.34-5.67i",	"123.45+67.89i",	"-0.0961415519586104+0.00694248653276682i"
+"-12.34+5.67i",	"123.45-67.89i",	"-0.0961415519586104-0.00694248653276682i"
+"-12.34-5.67i",	"123.45-67.89i",	"-0.0573549954111941-0.0774712890924744i"
+"-12.34-5.67i",	"123.45-67.89",		"#NUM!"
+"-12.34-5.67j",	"123.45-67.89",		"#NUM!"
+"-12.34-5.67",	"123.45-67.89j",	"#NUM!"
+"-12.34-5.67i",	"-12.34-5.67i",		"1"
+"-12.34",	"123.45-67.89i",	"-0.0767482736849023-0.0422068878126206i"
+"-12.34-5.67i",	"-12.34",		"1+0.459481361426256i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMEXP.data b/tests/rawTestData/Calculation/Engineering/IMEXP.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/Engineering/IMEXP.data
rename to tests/rawTestData/Calculation/Engineering/IMEXP.data
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMLN.data b/tests/rawTestData/Calculation/Engineering/IMLN.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMLN.data
rename to tests/rawTestData/Calculation/Engineering/IMLN.data
index 33daf6dc..cb24be4e 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMLN.data
+++ b/tests/rawTestData/Calculation/Engineering/IMLN.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",		"2.60862008281875+0.430710595550204j"
-"-1.234E-5+6.78E9i",	"22.6372429388987+1.5707963267949i"
-"3.5+2.5i",		"1.45888536604214+0.620249485982821i"
-"3.5+i",			"1.29199877621612+0.278299659005111i"
-"3.5",			"1.25276296849537"
-"3.5-i",			"1.29199877621612-0.278299659005111i"
-"3.5-2.5i",		"1.45888536604214-0.620249485982821i"
-"1+2.5i",		"0.990500734433292+1.19028994968253i"
-"1+i",			"0.346573590279973+0.785398163397448i"
-"1",			"0"
-"1-i",			"0.346573590279973-0.785398163397448i"
-"1-2.5i",		"0.990500734433292-1.19028994968253i"
-"2.5i",			"0.916290731874155+1.5707963267949i"
-"i",			"1.5707963267949i"
-"0",			"#NUM!"
-"-i",			"-1.5707963267949i"
-"-2.5i",			"0.916290731874155-1.5707963267949i"
-"-1+2.5i",		"0.990500734433292+1.95130270390726i"
-"-1+i",			"0.346573590279973+2.35619449019234i"
-"-1",			"3.14159265358979i"
-"-1-i",			"0.346573590279973-2.35619449019234i"
-"-1-2.5i",		"0.990500734433292-1.95130270390726i"
-"-3.5+2.5i",		"1.45888536604214+2.52134316760697i"
-"-3.5+i",		"1.29199877621612+2.86329299458468i"
-"-3.5",			"1.25276296849537+3.14159265358979i"
-"-3.5-i",		"1.29199877621612-2.86329299458468i"
-"-3.5-2.5i",		"1.45888536604214-2.52134316760697i"
+"12.34+5.67j",		"2.60862008281875+0.430710595550204j"
+"-1.234E-5+6.78E9i",	"22.6372429388987+1.5707963267949i"
+"3.5+2.5i",		"1.45888536604214+0.620249485982821i"
+"3.5+i",			"1.29199877621612+0.278299659005111i"
+"3.5",			"1.25276296849537"
+"3.5-i",			"1.29199877621612-0.278299659005111i"
+"3.5-2.5i",		"1.45888536604214-0.620249485982821i"
+"1+2.5i",		"0.990500734433292+1.19028994968253i"
+"1+i",			"0.346573590279973+0.785398163397448i"
+"1",			"0"
+"1-i",			"0.346573590279973-0.785398163397448i"
+"1-2.5i",		"0.990500734433292-1.19028994968253i"
+"2.5i",			"0.916290731874155+1.5707963267949i"
+"i",			"1.5707963267949i"
+"0",			"#NUM!"
+"-i",			"-1.5707963267949i"
+"-2.5i",			"0.916290731874155-1.5707963267949i"
+"-1+2.5i",		"0.990500734433292+1.95130270390726i"
+"-1+i",			"0.346573590279973+2.35619449019234i"
+"-1",			"3.14159265358979i"
+"-1-i",			"0.346573590279973-2.35619449019234i"
+"-1-2.5i",		"0.990500734433292-1.95130270390726i"
+"-3.5+2.5i",		"1.45888536604214+2.52134316760697i"
+"-3.5+i",		"1.29199877621612+2.86329299458468i"
+"-3.5",			"1.25276296849537+3.14159265358979i"
+"-3.5-i",		"1.29199877621612-2.86329299458468i"
+"-3.5-2.5i",		"1.45888536604214-2.52134316760697i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMLOG10.data b/tests/rawTestData/Calculation/Engineering/IMLOG10.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMLOG10.data
rename to tests/rawTestData/Calculation/Engineering/IMLOG10.data
index 5832e8a8..8c57ff90 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMLOG10.data
+++ b/tests/rawTestData/Calculation/Engineering/IMLOG10.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",		"1.13290930735019+0.187055234944717j"
-"-12.34E-5+6.78E9i",	"9.83122969386706+0.682188176920927i"
-"3.5+2.5i",		"0.633585864201507+0.269370929165668i"
-"3.5+i",		"0.561107939136413+0.120864006221476i"
-"3.5",			"0.544068044350276"
-"3.5-i",		"0.561107939136413-0.120864006221476i"
-"3.5-2.5i",		"0.633585864201507-0.269370929165668i"
-"1+2.5i",		"0.430169003285497+0.516936357012023i"
-"1+i",			"0.150514997831991+0.34109408846046i"
-"1",			"0"
-"1-i",			"0.150514997831991-0.34109408846046i"
-"1-2.5i",		"0.430169003285497-0.516936357012023i"
-"2.5i",			"0.397940008672038+0.68218817692092i"
-"i",			"0.68218817692092i"
-"0",			"#NUM!"
-"-i",			"-0.68218817692092i"
-"-2.5i",		"0.397940008672038-0.68218817692092i"
-"-1+2.5i",		"0.430169003285497+0.847439996829817i"
-"-1+i",			"0.150514997831991+1.02328226538138i"
-"-1",			"1.36437635384184i"
-"-1-i",			"0.150514997831991-1.02328226538138i"
-"-1-2.5i",		"0.430169003285497-0.847439996829817i"
-"-3.5+2.5i",		"0.633585864201507+1.09500542467617i"
-"-3.5+i",		"0.561107939136413+1.24351234762036i"
-"-3.5",			"0.544068044350276+1.36437635384184i"
-"-3.5-i",		"0.561107939136413-1.24351234762036i"
-"-3.5-2.5i",		"0.633585864201507-1.09500542467617i"
+"12.34+5.67j",		"1.13290930735019+0.187055234944717j"
+"-12.34E-5+6.78E9i",	"9.83122969386706+0.682188176920927i"
+"3.5+2.5i",		"0.633585864201507+0.269370929165668i"
+"3.5+i",		"0.561107939136413+0.120864006221476i"
+"3.5",			"0.544068044350276"
+"3.5-i",		"0.561107939136413-0.120864006221476i"
+"3.5-2.5i",		"0.633585864201507-0.269370929165668i"
+"1+2.5i",		"0.430169003285497+0.516936357012023i"
+"1+i",			"0.150514997831991+0.34109408846046i"
+"1",			"0"
+"1-i",			"0.150514997831991-0.34109408846046i"
+"1-2.5i",		"0.430169003285497-0.516936357012023i"
+"2.5i",			"0.397940008672038+0.68218817692092i"
+"i",			"0.68218817692092i"
+"0",			"#NUM!"
+"-i",			"-0.68218817692092i"
+"-2.5i",		"0.397940008672038-0.68218817692092i"
+"-1+2.5i",		"0.430169003285497+0.847439996829817i"
+"-1+i",			"0.150514997831991+1.02328226538138i"
+"-1",			"1.36437635384184i"
+"-1-i",			"0.150514997831991-1.02328226538138i"
+"-1-2.5i",		"0.430169003285497-0.847439996829817i"
+"-3.5+2.5i",		"0.633585864201507+1.09500542467617i"
+"-3.5+i",		"0.561107939136413+1.24351234762036i"
+"-3.5",			"0.544068044350276+1.36437635384184i"
+"-3.5-i",		"0.561107939136413-1.24351234762036i"
+"-3.5-2.5i",		"0.633585864201507-1.09500542467617i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMLOG2.data b/tests/rawTestData/Calculation/Engineering/IMLOG2.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMLOG2.data
rename to tests/rawTestData/Calculation/Engineering/IMLOG2.data
index 1f8e5eb0..a5a41367 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMLOG2.data
+++ b/tests/rawTestData/Calculation/Engineering/IMLOG2.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",		"3.76344325733562+0.621384040306436j"
-"-12.34E-5+6.78E9i",	"32.6586381298614+2.26618007108803i"
-"3.5+2.5i",		"2.10472668297646+0.894830857610216i"
-"3.5+i",		"1.86396022742506+0.401501537958665i"
-"3.5",			"1.80735492219671"
-"3.5-i",		"1.86396022742506-0.401501537958665i"
-"3.5-2.5i",		"2.10472668297646-0.894830857610216i"
-"1+2.5i",		"1.42899049767377+1.71722540775913i"
-"1+i",			"0.500000000038482+1.13309003554401i"
-"1",			"0"
-"1-i",			"0.500000000038482-1.13309003554401i"
-"1-2.5i",		"1.42899049767377-1.71722540775913i"
-"2.5i",			"1.3219280949891+2.26618007108801i"
-"i",			"2.26618007108801i"
-"0",			"#NUM!"
-"-i",			"-2.26618007108801i"
-"-2.5i",		"1.3219280949891-2.26618007108801i"
-"-1+2.5i",		"1.42899049767377+2.81513473441689i"
-"-1+i",			"0.500000000038482+3.39927010663201i"
-"-1",			"4.53236014217602i"
-"-1-i",			"0.500000000038482-3.39927010663201i"
-"-1-2.5i",		"1.42899049767377-2.81513473441689i"
-"-3.5+2.5i",		"2.10472668297646+3.63752928456581i"
-"-3.5+i",		"1.86396022742506+4.13085860421736i"
-"-3.5",			"1.80735492219671+4.53236014217602i"
-"-3.5-i",		"1.86396022742506-4.13085860421736i"
-"-3.5-2.5i",		"2.10472668297646-3.63752928456581i"
+"12.34+5.67j",		"3.76344325733562+0.621384040306436j"
+"-12.34E-5+6.78E9i",	"32.6586381298614+2.26618007108803i"
+"3.5+2.5i",		"2.10472668297646+0.894830857610216i"
+"3.5+i",		"1.86396022742506+0.401501537958665i"
+"3.5",			"1.80735492219671"
+"3.5-i",		"1.86396022742506-0.401501537958665i"
+"3.5-2.5i",		"2.10472668297646-0.894830857610216i"
+"1+2.5i",		"1.42899049767377+1.71722540775913i"
+"1+i",			"0.500000000038482+1.13309003554401i"
+"1",			"0"
+"1-i",			"0.500000000038482-1.13309003554401i"
+"1-2.5i",		"1.42899049767377-1.71722540775913i"
+"2.5i",			"1.3219280949891+2.26618007108801i"
+"i",			"2.26618007108801i"
+"0",			"#NUM!"
+"-i",			"-2.26618007108801i"
+"-2.5i",		"1.3219280949891-2.26618007108801i"
+"-1+2.5i",		"1.42899049767377+2.81513473441689i"
+"-1+i",			"0.500000000038482+3.39927010663201i"
+"-1",			"4.53236014217602i"
+"-1-i",			"0.500000000038482-3.39927010663201i"
+"-1-2.5i",		"1.42899049767377-2.81513473441689i"
+"-3.5+2.5i",		"2.10472668297646+3.63752928456581i"
+"-3.5+i",		"1.86396022742506+4.13085860421736i"
+"-3.5",			"1.80735492219671+4.53236014217602i"
+"-3.5-i",		"1.86396022742506-4.13085860421736i"
+"-3.5-2.5i",		"2.10472668297646-3.63752928456581i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMPOWER.data b/tests/rawTestData/Calculation/Engineering/IMPOWER.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Engineering/IMPOWER.data
rename to tests/rawTestData/Calculation/Engineering/IMPOWER.data
index d9acf508..8e753bc2 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMPOWER.data
+++ b/tests/rawTestData/Calculation/Engineering/IMPOWER.data
@@ -1,18 +1,18 @@
-"12.34+5.67j",	2,		"120.1267+139.9356j"
-"12.34+5.67j",	3,		"688.928626+2407.923693j"
-"12.34+5.67j",	-1,		"6.69108496973016E-002-3.07442883131037E-002j"
-"12.34+5.67j",	-2,		"3.53185054333564E-003-4.11425290873718E-003j"
-"12.34+5.67j",	0.5,		"3.60002071031685+0.787495469644252j"
-"12.34+5.67j",	-0.25,		"0.517904976730581-5.59833234375533E-002j"
-"12.34+5.67j",	0,		"1"
-"-i",		2,		"-1-1.34451369308841E-014i"
-"1-i",		2,		"1.22460635382238E-016-2i"
-"2.5i",		2,		"-6.25+8.40321058180257E-014i"
-"2.5i",		"2.5",		"-6.98771242968685-6.98771242968684i"
-"2.5i",		"2.5i",		"#VALUE!"
-"2.5",		"2.5",		9.88211768802619
-"2",		"2",		4
-"-12.34-5.67i",	"-12.34",	"-4.69972844488573E-15+9.35464904349343E-15i"
-"12.34-5.67i",	"-12.34",	"5.93343000067521E-15-8.62503997728057E-15i"
-"-12.34-5.67i",	"12.34",	"-42881944468901.9-85355046682682.3i"
-"12.34-5.67i",	"12.34",	"54138663282971.3+78697841733874.3i"
+"12.34+5.67j",	2,		"120.1267+139.9356j"
+"12.34+5.67j",	3,		"688.928626+2407.923693j"
+"12.34+5.67j",	-1,		"6.69108496973016E-002-3.07442883131037E-002j"
+"12.34+5.67j",	-2,		"3.53185054333564E-003-4.11425290873718E-003j"
+"12.34+5.67j",	0.5,		"3.60002071031685+0.787495469644252j"
+"12.34+5.67j",	-0.25,		"0.517904976730581-5.59833234375533E-002j"
+"12.34+5.67j",	0,		"1"
+"-i",		2,		"-1-1.34451369308841E-014i"
+"1-i",		2,		"1.22460635382238E-016-2i"
+"2.5i",		2,		"-6.25+8.40321058180257E-014i"
+"2.5i",		"2.5",		"-6.98771242968685-6.98771242968684i"
+"2.5i",		"2.5i",		"#VALUE!"
+"2.5",		"2.5",		9.88211768802619
+"2",		"2",		4
+"-12.34-5.67i",	"-12.34",	"-4.69972844488573E-15+9.35464904349343E-15i"
+"12.34-5.67i",	"-12.34",	"5.93343000067521E-15-8.62503997728057E-15i"
+"-12.34-5.67i",	"12.34",	"-42881944468901.9-85355046682682.3i"
+"12.34-5.67i",	"12.34",	"54138663282971.3+78697841733874.3i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMPRODUCT.data b/tests/rawTestData/Calculation/Engineering/IMPRODUCT.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Engineering/IMPRODUCT.data
rename to tests/rawTestData/Calculation/Engineering/IMPRODUCT.data
index 99149562..81ab40b7 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMPRODUCT.data
+++ b/tests/rawTestData/Calculation/Engineering/IMPRODUCT.data
@@ -1,15 +1,15 @@
-"12.34+5.67j",	"123.45+67.89i",			"#NUM!"
-"12.34+5.67j",						"12.34+5.67j"
-"12.34+5.67i",	"123.45+67.89i",	"5.67",		"6454.936089+8718.895647i"
-"12.34+5.67j",	"123.45+67.89j",	"5.67",		"6454.936089+8718.895647j"
-"12.34+5.67j",	"123.45+67.89j",			"1138.4367+1537.7241j"
-"12.34-5.67i",	"123.45+67.89i",			"1908.3093+137.8011i"
-"12.34+5.67i",	"123.45-67.89i",			"1908.3093-137.8011i"
-"12.34-5.67i",	"123.45-67.89i",			"1138.4367-1537.7241i"
-"-12.34+5.67i",	"123.45+67.89i",			"-1908.3093-137.8011i"
-"-12.34-5.67i",	"123.45+67.89i",			"-1138.4367-1537.7241i"
-"12.34+5.67i",	"-123.45+67.89i",			"-1908.3093+137.8011i"
-"-12.34+5.67i",	"-123.45+67.89i",			"1138.4367-1537.7241i"
-"-12.34-5.67i",	"-123.45-67.89i",			"1138.4367+1537.7241i"
-"-12.34",	"123.45-67.89i",			"-1523.373+837.7626i"
-"-12.34-5.67i",	"-12.34",				"152.2756+69.9678i"
+"12.34+5.67j",	"123.45+67.89i",			"#NUM!"
+"12.34+5.67j",						"12.34+5.67j"
+"12.34+5.67i",	"123.45+67.89i",	"5.67",		"6454.936089+8718.895647i"
+"12.34+5.67j",	"123.45+67.89j",	"5.67",		"6454.936089+8718.895647j"
+"12.34+5.67j",	"123.45+67.89j",			"1138.4367+1537.7241j"
+"12.34-5.67i",	"123.45+67.89i",			"1908.3093+137.8011i"
+"12.34+5.67i",	"123.45-67.89i",			"1908.3093-137.8011i"
+"12.34-5.67i",	"123.45-67.89i",			"1138.4367-1537.7241i"
+"-12.34+5.67i",	"123.45+67.89i",			"-1908.3093-137.8011i"
+"-12.34-5.67i",	"123.45+67.89i",			"-1138.4367-1537.7241i"
+"12.34+5.67i",	"-123.45+67.89i",			"-1908.3093+137.8011i"
+"-12.34+5.67i",	"-123.45+67.89i",			"1138.4367-1537.7241i"
+"-12.34-5.67i",	"-123.45-67.89i",			"1138.4367+1537.7241i"
+"-12.34",	"123.45-67.89i",			"-1523.373+837.7626i"
+"-12.34-5.67i",	"-12.34",				"152.2756+69.9678i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMREAL.data b/tests/rawTestData/Calculation/Engineering/IMREAL.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/Engineering/IMREAL.data
rename to tests/rawTestData/Calculation/Engineering/IMREAL.data
index 3a9ba847..ffa4382c 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMREAL.data
+++ b/tests/rawTestData/Calculation/Engineering/IMREAL.data
@@ -1,30 +1,30 @@
-12.34+5.67j",		12.34
-"-1.234E-5+6.78E9i",	-1.234E-5
-"3.5+2.5i",		3.5
-"3.5+i",		3.5
-"3.5",			3.5
-3.5,			3.5
-"3.5-i",		3.5
-"3.5-2.5i",		3.5
-"1+2.5i",		1
-"1+i",			1
-"1",			1
-1,			1
-"1-i",			1
-"1-2.5i",		1
-"2.5i",			0
-"i",			0
-"0",			0
-0,			0
-"-i",			0
-"-2.5i",		0
-"-1+2.5i",		-1
-"-1+i",			-1
-"-1",			-1
-"-1-i",			-1
-"-1-2.5i",		-1
-"-3.5+2.5i",		-3.5
-"-3.5+i",		-3.5
-"-3.5",			-3.5
-"-3.5-i",		-3.5
-"-3.5-2.5i",		-3.5
+12.34+5.67j",		12.34
+"-1.234E-5+6.78E9i",	-1.234E-5
+"3.5+2.5i",		3.5
+"3.5+i",		3.5
+"3.5",			3.5
+3.5,			3.5
+"3.5-i",		3.5
+"3.5-2.5i",		3.5
+"1+2.5i",		1
+"1+i",			1
+"1",			1
+1,			1
+"1-i",			1
+"1-2.5i",		1
+"2.5i",			0
+"i",			0
+"0",			0
+0,			0
+"-i",			0
+"-2.5i",		0
+"-1+2.5i",		-1
+"-1+i",			-1
+"-1",			-1
+"-1-i",			-1
+"-1-2.5i",		-1
+"-3.5+2.5i",		-3.5
+"-3.5+i",		-3.5
+"-3.5",			-3.5
+"-3.5-i",		-3.5
+"-3.5-2.5i",		-3.5
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMSIN.data b/tests/rawTestData/Calculation/Engineering/IMSIN.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMSIN.data
rename to tests/rawTestData/Calculation/Engineering/IMSIN.data
index 171e1a6d..50ab2003 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMSIN.data
+++ b/tests/rawTestData/Calculation/Engineering/IMSIN.data
@@ -1,27 +1,27 @@
-"12.34+5.67j",	"-32.5483841590412+141.315819535092j"
-"3.5+2.5i",	"-2.15110429680353-5.66575444574645i"
-"3.5+i",	"-0.541286805665839-1.10052501669986i"
-"3.5",		"-0.35078322768962"
-"3.5-i",	"-0.541286805665839+1.10052501669986i"
-"3.5-2.5i",	"-2.15110429680353+5.66575444574645i"
-"1+2.5i",	"5.16014366757971+3.26893943207955i"
-"1+i",		"1.29845758141598+0.634963914784736i"
-"1",		"0.841470984807897"
-"1-i",		"1.29845758141598-0.634963914784736i"
-"1-2.5i",	"5.16014366757971-3.26893943207955i"
-"2.5i",		"6.05020448103979i"
-"i",		"1.1752011936438i"
-"0",		"0"
-"-i",		"-1.1752011936438i"
-"-2.5i",	"-6.05020448103979i"
-"-1+2.5i",	"-5.16014366757971+3.26893943207955i"
-"-1+i",		"-1.29845758141598+0.634963914784736i"
-"-1",		"-0.841470984807897"
-"-1-i",		"-1.29845758141598-0.634963914784736i"
-"-1-2.5i",	"-5.16014366757971-3.26893943207955i"
-"-3.5+2.5i",	"2.15110429680353-5.66575444574645i"
-"-3.5+i",	"0.541286805665839-1.10052501669986i"
-"-3.5",		"0.35078322768962"
-"-3.5-i",	"0.541286805665839+1.10052501669986i"
-"-3.5-2.5i",	"2.15110429680353+5.66575444574645i"
-"3",		"0.141120008059867"
+"12.34+5.67j",	"-32.5483841590412+141.315819535092j"
+"3.5+2.5i",	"-2.15110429680353-5.66575444574645i"
+"3.5+i",	"-0.541286805665839-1.10052501669986i"
+"3.5",		"-0.35078322768962"
+"3.5-i",	"-0.541286805665839+1.10052501669986i"
+"3.5-2.5i",	"-2.15110429680353+5.66575444574645i"
+"1+2.5i",	"5.16014366757971+3.26893943207955i"
+"1+i",		"1.29845758141598+0.634963914784736i"
+"1",		"0.841470984807897"
+"1-i",		"1.29845758141598-0.634963914784736i"
+"1-2.5i",	"5.16014366757971-3.26893943207955i"
+"2.5i",		"6.05020448103979i"
+"i",		"1.1752011936438i"
+"0",		"0"
+"-i",		"-1.1752011936438i"
+"-2.5i",	"-6.05020448103979i"
+"-1+2.5i",	"-5.16014366757971+3.26893943207955i"
+"-1+i",		"-1.29845758141598+0.634963914784736i"
+"-1",		"-0.841470984807897"
+"-1-i",		"-1.29845758141598-0.634963914784736i"
+"-1-2.5i",	"-5.16014366757971-3.26893943207955i"
+"-3.5+2.5i",	"2.15110429680353-5.66575444574645i"
+"-3.5+i",	"0.541286805665839-1.10052501669986i"
+"-3.5",		"0.35078322768962"
+"-3.5-i",	"0.541286805665839+1.10052501669986i"
+"-3.5-2.5i",	"2.15110429680353+5.66575444574645i"
+"3",		"0.141120008059867"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMSQRT.data b/tests/rawTestData/Calculation/Engineering/IMSQRT.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Engineering/IMSQRT.data
rename to tests/rawTestData/Calculation/Engineering/IMSQRT.data
index cf0c0db3..d35a4d75 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMSQRT.data
+++ b/tests/rawTestData/Calculation/Engineering/IMSQRT.data
@@ -1,28 +1,28 @@
-"12.34+5.67j",		"3.60002071031685+0.787495469644252j"
-"-1.234E-5+6.78E9i",	"58223.7065120385+58223.7065120386i"
-"3.5+2.5i",		"1.9749889409211+0.632914936433528i"
-"3.5+i",		"1.88945163270197+0.264627043818521i"
-"3.5",			"1.87082869338697"
-"3.5-i",		"1.88945163270197-0.264627043818521i"
-"3.5-2.5i",		"1.9749889409211-0.632914936433528i"
-"1+2.5i",		"1.35878298553655+0.919940868634298i"
-"1+i",			"1.09868411346781+0.455089860562227i"
-"1",			"1"
-"1-i",			"1.09868411346781-0.455089860562227i"
-"1-2.5i",		"1.35878298553655-0.919940868634298i"
-"2.5i",			"1.11803398874989+1.11803398874989i"
-"i",			"0.707106781186548+0.707106781186547i"
-"0",			"0"
-"-i",			"0.707106781186548-0.707106781186547i"
-"-2.5i",		"1.11803398874989-1.11803398874989i"
-"-1+2.5i",		"0.919940868634298+1.35878298553655i"
-"-1+i",			"0.455089860562227+1.09868411346781i"
-"-1",			"6.12303176911189E-017+i"
-"-1-i",			"0.455089860562227-1.09868411346781i"
-"-1-2.5i",		"0.919940868634298-1.35878298553655i"
-"-3.5+2.5i",		"0.632914936433528+1.9749889409211i"
-"-3.5+i",		"0.264627043818521+1.88945163270197i"
-"-3.5",			"1.14551435241745E-016+1.87082869338697i"
-"-3.5-i",		"0.264627043818521-1.88945163270197i"
-"-3.5-2.5i",		"0.632914936433528-1.9749889409211i"
-"9",			"3"
+"12.34+5.67j",		"3.60002071031685+0.787495469644252j"
+"-1.234E-5+6.78E9i",	"58223.7065120385+58223.7065120386i"
+"3.5+2.5i",		"1.9749889409211+0.632914936433528i"
+"3.5+i",		"1.88945163270197+0.264627043818521i"
+"3.5",			"1.87082869338697"
+"3.5-i",		"1.88945163270197-0.264627043818521i"
+"3.5-2.5i",		"1.9749889409211-0.632914936433528i"
+"1+2.5i",		"1.35878298553655+0.919940868634298i"
+"1+i",			"1.09868411346781+0.455089860562227i"
+"1",			"1"
+"1-i",			"1.09868411346781-0.455089860562227i"
+"1-2.5i",		"1.35878298553655-0.919940868634298i"
+"2.5i",			"1.11803398874989+1.11803398874989i"
+"i",			"0.707106781186548+0.707106781186547i"
+"0",			"0"
+"-i",			"0.707106781186548-0.707106781186547i"
+"-2.5i",		"1.11803398874989-1.11803398874989i"
+"-1+2.5i",		"0.919940868634298+1.35878298553655i"
+"-1+i",			"0.455089860562227+1.09868411346781i"
+"-1",			"6.12303176911189E-017+i"
+"-1-i",			"0.455089860562227-1.09868411346781i"
+"-1-2.5i",		"0.919940868634298-1.35878298553655i"
+"-3.5+2.5i",		"0.632914936433528+1.9749889409211i"
+"-3.5+i",		"0.264627043818521+1.88945163270197i"
+"-3.5",			"1.14551435241745E-016+1.87082869338697i"
+"-3.5-i",		"0.264627043818521-1.88945163270197i"
+"-3.5-2.5i",		"0.632914936433528-1.9749889409211i"
+"9",			"3"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMSUB.data b/tests/rawTestData/Calculation/Engineering/IMSUB.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Engineering/IMSUB.data
rename to tests/rawTestData/Calculation/Engineering/IMSUB.data
index fb0b85c3..024d3585 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMSUB.data
+++ b/tests/rawTestData/Calculation/Engineering/IMSUB.data
@@ -1,10 +1,10 @@
-"12.34+5.67j",		"123.45+67.89i",				"#NUM!"
-"123.45+67.89j",	"12.34+5.67j",					"111.11+62.22j"
-"12.34+5.67j",		"123.45+67.89j",				"-111.11-62.22j"
-"12.34+5.67i",		"123.45+67.89i",	"123.45+67.89i",	"-111.11-62.22i"
-"-12.34-5.67i",		"123.45-67.89i",				"-135.79+62.22i"
-"12.34-5.67i",		"-123.45-67.89i",				"135.79+62.22i"
-"-12.34-5.67i",		"-123.45-67.89i",				"111.11+62.22i"
-"-12.34-5.67i",		"-123.45-67.89",				"#NUM!"
-"-12.34-5.67j",		"-123.45-67.89",				"#NUM!"
-"-12.34-5.67",		"-123.45-67.89j",				"#NUM!"
+"12.34+5.67j",		"123.45+67.89i",				"#NUM!"
+"123.45+67.89j",	"12.34+5.67j",					"111.11+62.22j"
+"12.34+5.67j",		"123.45+67.89j",				"-111.11-62.22j"
+"12.34+5.67i",		"123.45+67.89i",	"123.45+67.89i",	"-111.11-62.22i"
+"-12.34-5.67i",		"123.45-67.89i",				"-135.79+62.22i"
+"12.34-5.67i",		"-123.45-67.89i",				"135.79+62.22i"
+"-12.34-5.67i",		"-123.45-67.89i",				"111.11+62.22i"
+"-12.34-5.67i",		"-123.45-67.89",				"#NUM!"
+"-12.34-5.67j",		"-123.45-67.89",				"#NUM!"
+"-12.34-5.67",		"-123.45-67.89j",				"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Engineering/IMSUM.data b/tests/rawTestData/Calculation/Engineering/IMSUM.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Engineering/IMSUM.data
rename to tests/rawTestData/Calculation/Engineering/IMSUM.data
index 70f5cccd..e63aed94 100644
--- a/unitTests/rawTestData/Calculation/Engineering/IMSUM.data
+++ b/tests/rawTestData/Calculation/Engineering/IMSUM.data
@@ -1,10 +1,10 @@
-"12.34+5.67j",	"123.45+67.89i",				"#NUM!"
-"12.34+5.67j",	"123.45+67.89j",				"135.79+73.56j"
-"12.34-5.67i",	"123.45+67.89i",				"135.79+62.22i"
-"12.34+5.67i",	"123.45-67.89i",				"135.79-62.22i"
-"12.34-5.67i",	"123.45-67.89i",				"135.79-73.56i"
-"12.34+5.67i",	"123.45+67.89i",	"123.45+67.89i",	"259.24+141.45i"
-"12.34+5.67i",	"123.45+67.89i",	"123.45+67.89j",	"#NUM!"
-"-12.34-5.67i",	"123.45-67.89i",				"111.11-73.56i"
-"12.34-5.67i",	"-123.45-67.89i",				"-111.11-73.56i"
-"-12.34-5.67i",	"-123.45-67.89i",				"-135.79-73.56i"
+"12.34+5.67j",	"123.45+67.89i",				"#NUM!"
+"12.34+5.67j",	"123.45+67.89j",				"135.79+73.56j"
+"12.34-5.67i",	"123.45+67.89i",				"135.79+62.22i"
+"12.34+5.67i",	"123.45-67.89i",				"135.79-62.22i"
+"12.34-5.67i",	"123.45-67.89i",				"135.79-73.56i"
+"12.34+5.67i",	"123.45+67.89i",	"123.45+67.89i",	"259.24+141.45i"
+"12.34+5.67i",	"123.45+67.89i",	"123.45+67.89j",	"#NUM!"
+"-12.34-5.67i",	"123.45-67.89i",				"111.11-73.56i"
+"12.34-5.67i",	"-123.45-67.89i",				"-111.11-73.56i"
+"-12.34-5.67i",	"-123.45-67.89i",				"-135.79-73.56i"
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data b/tests/rawTestData/Calculation/Engineering/OCT2BIN.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data
rename to tests/rawTestData/Calculation/Engineering/OCT2BIN.data
index 0573b9fd..765c3d8d 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2BIN.data
+++ b/tests/rawTestData/Calculation/Engineering/OCT2BIN.data
@@ -1,13 +1,13 @@
-"1357",			"#NUM!"
-"246",			"10100110"
-"3",		3,	"011"
-"12345",		"#NUM!"
-"123.45",		"#NUM!"
-"0",			"0"
-TRUE,			"#VALUE!"
-"3579",			"#NUM!"
-"7777777000",		"1000000000"	//	2's Complement
-"7777777777",		"1111111111"	//	2's Complement
-"17777777777",		"#NUM!"	//	Too small
-"777",		"111111111"
-"1777",		"#NUM!"	//	Too large
+"1357",			"#NUM!"
+"246",			"10100110"
+"3",		3,	"011"
+"12345",		"#NUM!"
+"123.45",		"#NUM!"
+"0",			"0"
+TRUE,			"#VALUE!"
+"3579",			"#NUM!"
+"7777777000",		"1000000000"	//	2's Complement
+"7777777777",		"1111111111"	//	2's Complement
+"17777777777",		"#NUM!"	//	Too small
+"777",		"111111111"
+"1777",		"#NUM!"	//	Too large
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data b/tests/rawTestData/Calculation/Engineering/OCT2DEC.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data
rename to tests/rawTestData/Calculation/Engineering/OCT2DEC.data
index d2fb32c9..19f6dbd6 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2DEC.data
+++ b/tests/rawTestData/Calculation/Engineering/OCT2DEC.data
@@ -1,9 +1,9 @@
-"1357",		"751"
-"246",		"166"
-"12345",	"5349"
-"123.45",	"#NUM!"
-"0",		"0"
-TRUE,		"#VALUE!"
-"3579",		"#NUM!"
-"54",		"44"
-"7777777533",	"-165"	//	2's Complement
+"1357",		"751"
+"246",		"166"
+"12345",	"5349"
+"123.45",	"#NUM!"
+"0",		"0"
+TRUE,		"#VALUE!"
+"3579",		"#NUM!"
+"54",		"44"
+"7777777533",	"-165"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data b/tests/rawTestData/Calculation/Engineering/OCT2HEX.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data
rename to tests/rawTestData/Calculation/Engineering/OCT2HEX.data
index 24771e89..c18e7fdb 100644
--- a/unitTests/rawTestData/Calculation/Engineering/OCT2HEX.data
+++ b/tests/rawTestData/Calculation/Engineering/OCT2HEX.data
@@ -1,9 +1,9 @@
-"1357",			"2EF"
-"246",			"A6"
-"12345",		"14E5"
-"100",		4,	"0040"
-"123.45",		"#NUM!"
-"0",			"0"
-TRUE,			"#VALUE!"
-"3579",			"#NUM!"
-"7777777533",		"FFFFFFFF5B"	//	2's Complement
+"1357",			"2EF"
+"246",			"A6"
+"12345",		"14E5"
+"100",		4,	"0040"
+"123.45",		"#NUM!"
+"0",			"0"
+TRUE,			"#VALUE!"
+"3579",			"#NUM!"
+"7777777533",		"FFFFFFFF5B"	//	2's Complement
diff --git a/unitTests/rawTestData/Calculation/Financial/ACCRINT.data b/tests/rawTestData/Calculation/Financial/ACCRINT.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/ACCRINT.data
rename to tests/rawTestData/Calculation/Financial/ACCRINT.data
index 94e1ed04..b7c4d052 100644
--- a/unitTests/rawTestData/Calculation/Financial/ACCRINT.data
+++ b/tests/rawTestData/Calculation/Financial/ACCRINT.data
@@ -1,8 +1,8 @@
-#Issue date	1st Interest	Settlement	Rate	Par	Freq	Basis	Result
-"2008-03-01",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	16.666666666667
-"2008-03-05",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	15.555555555556
-"2010-01-01",	"2010-06-30",	"2010-04-01",	0.08,	10000,	4,		200
-"2008-03-05",	"2008-08-31",	"2008-05-01",	-0.10,	1000,	2,	0,	"#NUM!"
-"Invalid Date",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	"#VALUE!"
-"2008-03-01",	"2008-08-31",	"2008-05-01",	"ABC",	1000,	2,	0,	"#VALUE!"
-"2008-03-01",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	"ABC",	"#VALUE!"
+#Issue date	1st Interest	Settlement	Rate	Par	Freq	Basis	Result
+"2008-03-01",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	16.666666666667
+"2008-03-05",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	15.555555555556
+"2010-01-01",	"2010-06-30",	"2010-04-01",	0.08,	10000,	4,		200
+"2008-03-05",	"2008-08-31",	"2008-05-01",	-0.10,	1000,	2,	0,	"#NUM!"
+"Invalid Date",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	0,	"#VALUE!"
+"2008-03-01",	"2008-08-31",	"2008-05-01",	"ABC",	1000,	2,	0,	"#VALUE!"
+"2008-03-01",	"2008-08-31",	"2008-05-01",	0.10,	1000,	2,	"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/ACCRINTM.data b/tests/rawTestData/Calculation/Financial/ACCRINTM.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/ACCRINTM.data
rename to tests/rawTestData/Calculation/Financial/ACCRINTM.data
index ea77e1b3..e43e93bb 100644
--- a/unitTests/rawTestData/Calculation/Financial/ACCRINTM.data
+++ b/tests/rawTestData/Calculation/Financial/ACCRINTM.data
@@ -1,6 +1,6 @@
-#Issue date	Settlement	Rate	Par	Basis	Result
-"2008-04-01",	"2008-06-15",	0.10,	1000,	3,	20.547945205479
-"2010-01-01",	"2010-12-31",	0.08,	10000,		800
-"2008-03-05",	"2008-08-31",	-0.10,	1000,	2,	"#NUM!"
-"Invalid Date",	"2008-08-31",	0.10,	1000,	2,	"#VALUE!"
-"2008-03-01",	"2008-08-31",	"ABC",	1000,	2,	"#VALUE!"
+#Issue date	Settlement	Rate	Par	Basis	Result
+"2008-04-01",	"2008-06-15",	0.10,	1000,	3,	20.547945205479
+"2010-01-01",	"2010-12-31",	0.08,	10000,		800
+"2008-03-05",	"2008-08-31",	-0.10,	1000,	2,	"#NUM!"
+"Invalid Date",	"2008-08-31",	0.10,	1000,	2,	"#VALUE!"
+"2008-03-01",	"2008-08-31",	"ABC",	1000,	2,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/AMORDEGRC.data b/tests/rawTestData/Calculation/Financial/AMORDEGRC.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/AMORDEGRC.data
rename to tests/rawTestData/Calculation/Financial/AMORDEGRC.data
index be2abd5c..d753a6d0 100644
--- a/unitTests/rawTestData/Calculation/Financial/AMORDEGRC.data
+++ b/tests/rawTestData/Calculation/Financial/AMORDEGRC.data
@@ -1,3 +1,3 @@
-#Cost	Date purchased	End of the 1st period	Salvage	Period	Depreciation	Basis	Result
-2400,	"2008-08-19",	"2008-12-31",		300,	1,	0.15,		1,	776
-150,	"2011-01-01",	"2011-09-30",		20,	1,	0.2,		4,	42
+#Cost	Date purchased	End of the 1st period	Salvage	Period	Depreciation	Basis	Result
+2400,	"2008-08-19",	"2008-12-31",		300,	1,	0.15,		1,	776
+150,	"2011-01-01",	"2011-09-30",		20,	1,	0.2,		4,	42
diff --git a/unitTests/rawTestData/Calculation/Financial/AMORLINC.data b/tests/rawTestData/Calculation/Financial/AMORLINC.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/AMORLINC.data
rename to tests/rawTestData/Calculation/Financial/AMORLINC.data
index 42bfa4b8..db6920ac 100644
--- a/unitTests/rawTestData/Calculation/Financial/AMORLINC.data
+++ b/tests/rawTestData/Calculation/Financial/AMORLINC.data
@@ -1,3 +1,3 @@
-#Cost	Date purchased	End of the 1st period	Salvage	Period	Depreciation	Basis	Result
-2400,	"2008-08-19",	"2008-12-31",		300,	1,	0.15,		1,	360
-150,	"2011-01-01",	"2011-09-30",		20,	1,	0.2,		4,	30
+#Cost	Date purchased	End of the 1st period	Salvage	Period	Depreciation	Basis	Result
+2400,	"2008-08-19",	"2008-12-31",		300,	1,	0.15,		1,	360
+150,	"2011-01-01",	"2011-09-30",		20,	1,	0.2,		4,	30
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPDAYBS.data b/tests/rawTestData/Calculation/Financial/COUPDAYBS.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPDAYBS.data
rename to tests/rawTestData/Calculation/Financial/COUPDAYBS.data
index 7b239560..5905db94 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPDAYBS.data
+++ b/tests/rawTestData/Calculation/Financial/COUPDAYBS.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	71
-"2011-01-01",	"2012-10-25",	4,			66
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	71
+"2011-01-01",	"2012-10-25",	4,			66
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPDAYS.data b/tests/rawTestData/Calculation/Financial/COUPDAYS.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPDAYS.data
rename to tests/rawTestData/Calculation/Financial/COUPDAYS.data
index f7e9baf3..26de7302 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPDAYS.data
+++ b/tests/rawTestData/Calculation/Financial/COUPDAYS.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	181
-"2011-01-01",	"2012-10-25",	4,			90
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	181
+"2011-01-01",	"2012-10-25",	4,			90
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPDAYSNC.data b/tests/rawTestData/Calculation/Financial/COUPDAYSNC.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPDAYSNC.data
rename to tests/rawTestData/Calculation/Financial/COUPDAYSNC.data
index 2bd5263a..91b9f73c 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPDAYSNC.data
+++ b/tests/rawTestData/Calculation/Financial/COUPDAYSNC.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	110
-"2011-01-01",	"2012-10-25",	4,			24
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	110
+"2011-01-01",	"2012-10-25",	4,			24
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPNCD.data b/tests/rawTestData/Calculation/Financial/COUPNCD.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPNCD.data
rename to tests/rawTestData/Calculation/Financial/COUPNCD.data
index 8bdaa7f2..fe5bba5d 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPNCD.data
+++ b/tests/rawTestData/Calculation/Financial/COUPNCD.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	39217
-"2011-01-01",	"2012-10-25",	4,			40568
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	39217
+"2011-01-01",	"2012-10-25",	4,			40568
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPNUM.data b/tests/rawTestData/Calculation/Financial/COUPNUM.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPNUM.data
rename to tests/rawTestData/Calculation/Financial/COUPNUM.data
index e3f7e82f..43f77cd7 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPNUM.data
+++ b/tests/rawTestData/Calculation/Financial/COUPNUM.data
@@ -1,7 +1,7 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	4
-"2011-01-01",	"2012-10-25",	4,		0,	8
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
-"01-Jan-2008",	"31-Dec-2012",	1,		1,	5
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	4
+"2011-01-01",	"2012-10-25",	4,		0,	8
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+"01-Jan-2008",	"31-Dec-2012",	1,		1,	5
diff --git a/unitTests/rawTestData/Calculation/Financial/COUPPCD.data b/tests/rawTestData/Calculation/Financial/COUPPCD.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/COUPPCD.data
rename to tests/rawTestData/Calculation/Financial/COUPPCD.data
index f6b23bd7..86212afa 100644
--- a/unitTests/rawTestData/Calculation/Financial/COUPPCD.data
+++ b/tests/rawTestData/Calculation/Financial/COUPPCD.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Frequency	Basis	Result
-"25-Jan-2007",	"15-Nov-2008",	2,		1,	39036
-"2011-01-01",	"2012-10-25",	4,			40476
-"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
-"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
+#Settlement	Maturity	Frequency	Basis	Result
+"25-Jan-2007",	"15-Nov-2008",	2,		1,	39036
+"2011-01-01",	"2012-10-25",	4,			40476
+"Invalid Date",	"15-Nov-2008",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"Invalid Date",	2,		1,	"#VALUE!"
+"25-Jan-2007",	"15-Nov-2008",	3,		1,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/CUMIPMT.data b/tests/rawTestData/Calculation/Financial/CUMIPMT.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/CUMIPMT.data
rename to tests/rawTestData/Calculation/Financial/CUMIPMT.data
index cf6b6763..8427c465 100644
--- a/unitTests/rawTestData/Calculation/Financial/CUMIPMT.data
+++ b/tests/rawTestData/Calculation/Financial/CUMIPMT.data
@@ -1,10 +1,10 @@
-#rate		nper	pv	start_period	end_period	type	result
-0.0075,		360,	125000,	13,		24,		0,	-11135.232130751
-0.0075,		360,	125000,	1,		1,		0,	-937.50
-0.004166666667,	60,	50000,	1,		12,		0,	-2294.9775375121
-0.004166666667,	60,	50000,	13,		24,		0,	-1833.1000667254
-0.004166666667,	60,	50000,	25,		36,		0,	-1347.5920679425
-0.004166666667,	60,	50000,	37,		48,		0,	-837.24455850309
-0.004166666667,	60,	50000,	49,		60,		0,	-300.78670189939
-0.0075,		360,	125000,	24,		13,		0,	"#VALUE!"
-0.0075,		360,	125000,	24,		13,		2,	"#NUM!"
+#rate		nper	pv	start_period	end_period	type	result
+0.0075,		360,	125000,	13,		24,		0,	-11135.232130751
+0.0075,		360,	125000,	1,		1,		0,	-937.50
+0.004166666667,	60,	50000,	1,		12,		0,	-2294.9775375121
+0.004166666667,	60,	50000,	13,		24,		0,	-1833.1000667254
+0.004166666667,	60,	50000,	25,		36,		0,	-1347.5920679425
+0.004166666667,	60,	50000,	37,		48,		0,	-837.24455850309
+0.004166666667,	60,	50000,	49,		60,		0,	-300.78670189939
+0.0075,		360,	125000,	24,		13,		0,	"#VALUE!"
+0.0075,		360,	125000,	24,		13,		2,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/CUMPRINC.data b/tests/rawTestData/Calculation/Financial/CUMPRINC.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/CUMPRINC.data
rename to tests/rawTestData/Calculation/Financial/CUMPRINC.data
index ca340c78..65e6d6d1 100644
--- a/unitTests/rawTestData/Calculation/Financial/CUMPRINC.data
+++ b/tests/rawTestData/Calculation/Financial/CUMPRINC.data
@@ -1,10 +1,10 @@
-#rate		nper	pv	start_period	end_period	type	result
-0.0075,		360,	125000,	13,		24,		0,	-934.10712342088
-0.0075,		360,	125000,	1,		1,		0,	-68.278271180977
-0.004166666667,	60,	50000,	1,		12,		0,	-9027.7626490046
-0.004166666667,	60,	50000,	13,		24,		0,	-9489.6401197913
-0.004166666667,	60,	50000,	25,		36,		0,	-9975.1481185741
-0.004166666667,	60,	50000,	37,		48,		0,	-10485.495628014
-0.004166666667,	60,	50000,	49,		60,		0,	-11021.953484617
-0.0075,		360,	125000,	24,		13,		0,	"#VALUE!"
-0.0075,		360,	125000,	24,		13,		2,	"#NUM!"
+#rate		nper	pv	start_period	end_period	type	result
+0.0075,		360,	125000,	13,		24,		0,	-934.10712342088
+0.0075,		360,	125000,	1,		1,		0,	-68.278271180977
+0.004166666667,	60,	50000,	1,		12,		0,	-9027.7626490046
+0.004166666667,	60,	50000,	13,		24,		0,	-9489.6401197913
+0.004166666667,	60,	50000,	25,		36,		0,	-9975.1481185741
+0.004166666667,	60,	50000,	37,		48,		0,	-10485.495628014
+0.004166666667,	60,	50000,	49,		60,		0,	-11021.953484617
+0.0075,		360,	125000,	24,		13,		0,	"#VALUE!"
+0.0075,		360,	125000,	24,		13,		2,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/DB.data b/tests/rawTestData/Calculation/Financial/DB.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/DB.data
rename to tests/rawTestData/Calculation/Financial/DB.data
index eb38638d..e8c5fcf7 100644
--- a/unitTests/rawTestData/Calculation/Financial/DB.data
+++ b/tests/rawTestData/Calculation/Financial/DB.data
@@ -1,17 +1,17 @@
-#cost		salvage		life	period	month	result
-1000000,	100000,		6,	1,	7,	186083.33333333
-1000000,	100000,		6,	2,	7,	259639.41666667
-1000000,	100000,		6,	3,	7,	176814.44275
-1000000,	100000,		6,	4,	7,	120410.63551275
-1000000,	100000,		6,	5,	7,	81999.642784183
-1000000,	100000,		6,	6,	7,	55841.756736028
-1000000,	100000,		6,	7,	7,	15845.098473848
-10000,		1000,		5,	1,	6,	1845.00
-10000,		1000,		5,	2,	6,	3009.195
-10000,		1000,		5,	3,	6,	1898.802045
-10000,		1000,		5,	4,	6,	1198.144090395
-10000,		1000,		5,	5,	6,	756.02892103925
-10000,		1000,		5,	6,	6,	238.52712458788
-0,		0,		5,	6,	6,	0.0
--1000,		100,		5,	6,	6,	"#NUM!"
-"ABC",		100,		5,	6,	6,	"#VALUE!"
+#cost		salvage		life	period	month	result
+1000000,	100000,		6,	1,	7,	186083.33333333
+1000000,	100000,		6,	2,	7,	259639.41666667
+1000000,	100000,		6,	3,	7,	176814.44275
+1000000,	100000,		6,	4,	7,	120410.63551275
+1000000,	100000,		6,	5,	7,	81999.642784183
+1000000,	100000,		6,	6,	7,	55841.756736028
+1000000,	100000,		6,	7,	7,	15845.098473848
+10000,		1000,		5,	1,	6,	1845.00
+10000,		1000,		5,	2,	6,	3009.195
+10000,		1000,		5,	3,	6,	1898.802045
+10000,		1000,		5,	4,	6,	1198.144090395
+10000,		1000,		5,	5,	6,	756.02892103925
+10000,		1000,		5,	6,	6,	238.52712458788
+0,		0,		5,	6,	6,	0.0
+-1000,		100,		5,	6,	6,	"#NUM!"
+"ABC",		100,		5,	6,	6,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/DDB.data b/tests/rawTestData/Calculation/Financial/DDB.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/DDB.data
rename to tests/rawTestData/Calculation/Financial/DDB.data
index c8002f77..2dfd5205 100644
--- a/unitTests/rawTestData/Calculation/Financial/DDB.data
+++ b/tests/rawTestData/Calculation/Financial/DDB.data
@@ -1,16 +1,16 @@
-#cost		salvage		life	period	month	result
-2400,		300,		36500,	1,		0.13150684931507
-2400,		300,		36500,	2,		0.13149964346031
-2400,		300,		36500,	7,		0.13146362010871
-2400,		300,		36500,	7,	14,	0.91843145432708
-2400,		300,		120,	1,	2,	40.00
-2400,		300,		10,	1,	2,	480.00
-2400,		300,		10,	2,	1.5,	306.00
-2400,		300,		10,	10,		22.12254720000030
-10000,		1000,		5,	1,		4000.00
-10000,		1000,		5,	2,		2400.00
-10000,		1000,		5,	3,		1440.00
-10000,		1000,		5,	4,		864.00
-10000,		1000,		5,	5,		296.00
--2400,		300,		36500,	1,		"#NUM!"
-"ABC",		300,		36500,	1,		"#VALUE!"
+#cost		salvage		life	period	month	result
+2400,		300,		36500,	1,		0.13150684931507
+2400,		300,		36500,	2,		0.13149964346031
+2400,		300,		36500,	7,		0.13146362010871
+2400,		300,		36500,	7,	14,	0.91843145432708
+2400,		300,		120,	1,	2,	40.00
+2400,		300,		10,	1,	2,	480.00
+2400,		300,		10,	2,	1.5,	306.00
+2400,		300,		10,	10,		22.12254720000030
+10000,		1000,		5,	1,		4000.00
+10000,		1000,		5,	2,		2400.00
+10000,		1000,		5,	3,		1440.00
+10000,		1000,		5,	4,		864.00
+10000,		1000,		5,	5,		296.00
+-2400,		300,		36500,	1,		"#NUM!"
+"ABC",		300,		36500,	1,		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/DISC.data b/tests/rawTestData/Calculation/Financial/DISC.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/DISC.data
rename to tests/rawTestData/Calculation/Financial/DISC.data
index d14b1980..b5790c74 100644
--- a/unitTests/rawTestData/Calculation/Financial/DISC.data
+++ b/tests/rawTestData/Calculation/Financial/DISC.data
@@ -1,6 +1,6 @@
-#settlement	maturity	price	redemption	basis	result
-"2007-01-25",	"2007-06-15",	97.975,	100,		1,	0.052420213
-"2010-04-01",	"2015-03-31",	95,	100,			0.01
-"2010-04-01",	"2015-03-31",	0,	100,			"#NUM!"
-"2010-04-01",	"2015-03-31",	"ABC",	100,			"#VALUE!"
-"Invalid Date",	"2007-06-15",	97.975,	100,		1,	"#VALUE!"
+#settlement	maturity	price	redemption	basis	result
+"2007-01-25",	"2007-06-15",	97.975,	100,		1,	0.052420213
+"2010-04-01",	"2015-03-31",	95,	100,			0.01
+"2010-04-01",	"2015-03-31",	0,	100,			"#NUM!"
+"2010-04-01",	"2015-03-31",	"ABC",	100,			"#VALUE!"
+"Invalid Date",	"2007-06-15",	97.975,	100,		1,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/DOLLARDE.data b/tests/rawTestData/Calculation/Financial/DOLLARDE.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Financial/DOLLARDE.data
rename to tests/rawTestData/Calculation/Financial/DOLLARDE.data
index c11b9fc4..c41b51dc 100644
--- a/unitTests/rawTestData/Calculation/Financial/DOLLARDE.data
+++ b/tests/rawTestData/Calculation/Financial/DOLLARDE.data
@@ -1,10 +1,10 @@
-#fractional_dollar	fraction	result
-1.02,			16,		1.125
-1.1,			32,		1.3125
-1.01,			16,		1.0625
-1.1,			16,		1.625
-1.03,			32,		1.09375
-1.3,			32,		1.9375
-1.12,			32,		1.375
-1.2345,			0,		"#DIV/0!"
-1.2345,			-2,		"#NUM!"
+#fractional_dollar	fraction	result
+1.02,			16,		1.125
+1.1,			32,		1.3125
+1.01,			16,		1.0625
+1.1,			16,		1.625
+1.03,			32,		1.09375
+1.3,			32,		1.9375
+1.12,			32,		1.375
+1.2345,			0,		"#DIV/0!"
+1.2345,			-2,		"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/DOLLARFR.data b/tests/rawTestData/Calculation/Financial/DOLLARFR.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Financial/DOLLARFR.data
rename to tests/rawTestData/Calculation/Financial/DOLLARFR.data
index 2a3dead6..a83a7231 100644
--- a/unitTests/rawTestData/Calculation/Financial/DOLLARFR.data
+++ b/tests/rawTestData/Calculation/Financial/DOLLARFR.data
@@ -1,10 +1,10 @@
-#decimal_dollar		fraction	result
-1.125,			16,		1.02
-1.125,			32,		1.04
-1.0625,			16,		1.01
-1.625,			16,		1.1
-1.09375,		32,		1.03
-1.9375,			32,		1.3
-1.375,			32,		1.12
-1.2345,			0,		"#DIV/0!"
-1.2345,			-2,		"#NUM!"
+#decimal_dollar		fraction	result
+1.125,			16,		1.02
+1.125,			32,		1.04
+1.0625,			16,		1.01
+1.625,			16,		1.1
+1.09375,		32,		1.03
+1.9375,			32,		1.3
+1.375,			32,		1.12
+1.2345,			0,		"#DIV/0!"
+1.2345,			-2,		"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/EFFECT.data b/tests/rawTestData/Calculation/Financial/EFFECT.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Financial/EFFECT.data
rename to tests/rawTestData/Calculation/Financial/EFFECT.data
index 1969a9d3..34de2b2c 100644
--- a/unitTests/rawTestData/Calculation/Financial/EFFECT.data
+++ b/tests/rawTestData/Calculation/Financial/EFFECT.data
@@ -1,6 +1,6 @@
-#nominal_rate	npery	Result
-0.0525,		4,	0.053542667370758
-0.10,		4,	0.103812890625
-0.10,		2,	0.1025
-0.025,		2,	0.02515625
-1,		0,	"#NUM!"
+#nominal_rate	npery	Result
+0.0525,		4,	0.053542667370758
+0.10,		4,	0.103812890625
+0.10,		2,	0.1025
+0.025,		2,	0.02515625
+1,		0,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/FV.data b/tests/rawTestData/Calculation/Financial/FV.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/FV.data
rename to tests/rawTestData/Calculation/Financial/FV.data
index 3687cf8e..2955e9a2 100644
--- a/unitTests/rawTestData/Calculation/Financial/FV.data
+++ b/tests/rawTestData/Calculation/Financial/FV.data
@@ -1,9 +1,9 @@
-#rate		nper	pmt	pv	type	Result
-0.005,		10,	-200,	-500,	1,	2581.4033740601
-0.01,		12,	-1000,			12682.503013197
-0.009166666667,	35,	-2000,	,	1,	82846.246372418
-0.005,		12,	-100,	-1000,	1,	2301.4018303409
-0.004166666667,	60,	-1000,			68006.082841536
-0.025,		16,	-2000,	0,	1,	39729.460894166
-0.1,		12,	-100,	0,	2,	"#NUM!"
-0.0,		12,	-100,	-100,		1300
+#rate		nper	pmt	pv	type	Result
+0.005,		10,	-200,	-500,	1,	2581.4033740601
+0.01,		12,	-1000,			12682.503013197
+0.009166666667,	35,	-2000,	,	1,	82846.246372418
+0.005,		12,	-100,	-1000,	1,	2301.4018303409
+0.004166666667,	60,	-1000,			68006.082841536
+0.025,		16,	-2000,	0,	1,	39729.460894166
+0.1,		12,	-100,	0,	2,	"#NUM!"
+0.0,		12,	-100,	-100,		1300
diff --git a/unitTests/rawTestData/Calculation/Financial/FVSCHEDULE.data b/tests/rawTestData/Calculation/Financial/FVSCHEDULE.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/FVSCHEDULE.data
rename to tests/rawTestData/Calculation/Financial/FVSCHEDULE.data
index 98a7bc1b..0b5ad893 100644
--- a/unitTests/rawTestData/Calculation/Financial/FVSCHEDULE.data
+++ b/tests/rawTestData/Calculation/Financial/FVSCHEDULE.data
@@ -1,4 +1,4 @@
-#principal	schedule			Result
-1,		{0.09|0.11|0.1},		1.33089
-10,		{0.09;0.11;0.1},		13.3089
-10000,		{0.05|0.05|0.035|0.035|0.035},	12223.614571875
+#principal	schedule			Result
+1,		{0.09|0.11|0.1},		1.33089
+10,		{0.09;0.11;0.1},		13.3089
+10000,		{0.05|0.05|0.035|0.035|0.035},	12223.614571875
diff --git a/unitTests/rawTestData/Calculation/Financial/INTRATE.data b/tests/rawTestData/Calculation/Financial/INTRATE.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/INTRATE.data
rename to tests/rawTestData/Calculation/Financial/INTRATE.data
index dad80359..38195a42 100644
--- a/unitTests/rawTestData/Calculation/Financial/INTRATE.data
+++ b/tests/rawTestData/Calculation/Financial/INTRATE.data
@@ -1,6 +1,6 @@
-#Settlement	Maturity	Investment	Redemption	Basis	Result
-"2008-02-15",	"2008-05-15",	1000000,	1014420,	2,	0.05768
-"2005-04-01",	"2010-03-31",	1000,		2125,			0.225
-"2008-02-15",	"2008-05-15",	1000000,	1014420,	"ABC",	"#VALUE!"
-"2008-02-15",	"2008-05-15",	1000000,	-1014420,	2,	"#NUM!"
-"Invalid Date",	"2008-05-15",	1000000,	1014420,	2,	"#VALUE!"
+#Settlement	Maturity	Investment	Redemption	Basis	Result
+"2008-02-15",	"2008-05-15",	1000000,	1014420,	2,	0.05768
+"2005-04-01",	"2010-03-31",	1000,		2125,			0.225
+"2008-02-15",	"2008-05-15",	1000000,	1014420,	"ABC",	"#VALUE!"
+"2008-02-15",	"2008-05-15",	1000000,	-1014420,	2,	"#NUM!"
+"Invalid Date",	"2008-05-15",	1000000,	1014420,	2,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/IPMT.data b/tests/rawTestData/Calculation/Financial/IPMT.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/IPMT.data
rename to tests/rawTestData/Calculation/Financial/IPMT.data
index 777108d4..9d5dab00 100644
--- a/unitTests/rawTestData/Calculation/Financial/IPMT.data
+++ b/tests/rawTestData/Calculation/Financial/IPMT.data
@@ -1,9 +1,9 @@
-#rate		per	nper	pv		fv		type	Result
-0.008333333333,	3,	3,	8000,					-22.406893015021
-0.10,		3,	3,	8000,					-292.44712990937
-0.004166666667,	1,	60,	50000,					-208.33333335
-0.004166666667,	2,	60,	50000,					-205.26988189617
-0.00875,	1,	8,	10000,		5000,		1,	0.00
-0.00875,	2,	8,	10000,		5000,		1,	-70.968650395559
-0.005,		2,	8,	2500,		200,		6,	"#NUM!"
-0.005,		8,	2,	2500,		200,		1,	"#VALUE!"
+#rate		per	nper	pv		fv		type	Result
+0.008333333333,	3,	3,	8000,					-22.406893015021
+0.10,		3,	3,	8000,					-292.44712990937
+0.004166666667,	1,	60,	50000,					-208.33333335
+0.004166666667,	2,	60,	50000,					-205.26988189617
+0.00875,	1,	8,	10000,		5000,		1,	0.00
+0.00875,	2,	8,	10000,		5000,		1,	-70.968650395559
+0.005,		2,	8,	2500,		200,		6,	"#NUM!"
+0.005,		8,	2,	2500,		200,		1,	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Financial/IRR.data b/tests/rawTestData/Calculation/Financial/IRR.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/IRR.data
rename to tests/rawTestData/Calculation/Financial/IRR.data
index f032f786..0d4458ff 100644
--- a/unitTests/rawTestData/Calculation/Financial/IRR.data
+++ b/tests/rawTestData/Calculation/Financial/IRR.data
@@ -1,6 +1,6 @@
-#values					guess	Result
-{-70000;12000;15000;18000;21000},		-0.021244848273410
-{-70000;12000;15000;18000;21000;26000},		0.08663094803652
-{-70000;12000;15000;18000},		0.10,	-0.18213746414550
-{-100;20|24|28.80},				-0.13618951095869
-{-100;20|24|28.80|34.56|41.47},			0.130575756371527
+#values					guess	Result
+{-70000;12000;15000;18000;21000},		-0.021244848273410
+{-70000;12000;15000;18000;21000;26000},		0.08663094803652
+{-70000;12000;15000;18000},		0.10,	-0.18213746414550
+{-100;20|24|28.80},				-0.13618951095869
+{-100;20|24|28.80|34.56|41.47},			0.130575756371527
diff --git a/unitTests/rawTestData/Calculation/Financial/ISPMT.data b/tests/rawTestData/Calculation/Financial/ISPMT.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/ISPMT.data
rename to tests/rawTestData/Calculation/Financial/ISPMT.data
index 60cf73fd..eac8167d 100644
--- a/unitTests/rawTestData/Calculation/Financial/ISPMT.data
+++ b/tests/rawTestData/Calculation/Financial/ISPMT.data
@@ -1,5 +1,5 @@
-#rate		per	nper	pv		result
-0.008333333333,	1,	36,	8000000,	-64814.814812222
-0.10,		1,	3,	8000000,	-533333.33333333
-0.004166666667,	1,	60,	50000,		-204.8611111275
-0.004166666667,	2,	60,	50000,		-201.388888905
+#rate		per	nper	pv		result
+0.008333333333,	1,	36,	8000000,	-64814.814812222
+0.10,		1,	3,	8000000,	-533333.33333333
+0.004166666667,	1,	60,	50000,		-204.8611111275
+0.004166666667,	2,	60,	50000,		-201.388888905
diff --git a/unitTests/rawTestData/Calculation/Financial/MIRR.data b/tests/rawTestData/Calculation/Financial/MIRR.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/MIRR.data
rename to tests/rawTestData/Calculation/Financial/MIRR.data
index 0faa2b7d..f91b030b 100644
--- a/unitTests/rawTestData/Calculation/Financial/MIRR.data
+++ b/tests/rawTestData/Calculation/Financial/MIRR.data
@@ -1,6 +1,6 @@
-#values						finance_rate	reinvestment_rate	Result
-{-120000;39000|30000|21000|37000|46000},	0.10,		0.12,			0.12609413036591
-{-120000;39000|30000|21000},			0.10,		0.12,			-0.048044655249981
-{-120000;39000|30000|21000|37000|46000},	0.10,		0.14,			0.13475911082831
-{-100;12|14|11},				5.5,		5,			0.74021752686287
-{-100;12|14|11|13|16},				5.5,		5,			1.8579321744785
+#values						finance_rate	reinvestment_rate	Result
+{-120000;39000|30000|21000|37000|46000},	0.10,		0.12,			0.12609413036591
+{-120000;39000|30000|21000},			0.10,		0.12,			-0.048044655249981
+{-120000;39000|30000|21000|37000|46000},	0.10,		0.14,			0.13475911082831
+{-100;12|14|11},				5.5,		5,			0.74021752686287
+{-100;12|14|11|13|16},				5.5,		5,			1.8579321744785
diff --git a/unitTests/rawTestData/Calculation/Financial/NOMINAL.data b/tests/rawTestData/Calculation/Financial/NOMINAL.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/Financial/NOMINAL.data
rename to tests/rawTestData/Calculation/Financial/NOMINAL.data
index 932628c2..df78c553 100644
--- a/unitTests/rawTestData/Calculation/Financial/NOMINAL.data
+++ b/tests/rawTestData/Calculation/Financial/NOMINAL.data
@@ -1,6 +1,6 @@
-#effect_rate	npery	result
-0.053543,	4,	0.052500319868356
-0.10,		4,	0.09645475633778
-0.10,		2,	0.097617696340303
-0.025,		12,	0.024718035238113
--0.025,		12,	"#NUM!"
+#effect_rate	npery	result
+0.053543,	4,	0.052500319868356
+0.10,		4,	0.09645475633778
+0.10,		2,	0.097617696340303
+0.025,		12,	0.024718035238113
+-0.025,		12,	"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/Financial/NPER.data b/tests/rawTestData/Calculation/Financial/NPER.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/NPER.data
rename to tests/rawTestData/Calculation/Financial/NPER.data
index 0e0495a6..205d0aab 100644
--- a/unitTests/rawTestData/Calculation/Financial/NPER.data
+++ b/tests/rawTestData/Calculation/Financial/NPER.data
@@ -1,10 +1,10 @@
-#rate		pmt	pv	fv	type	result
-0.01,		-100,	-1000,	10000,	1,	59.673865674295
-0.01,		-100,	-1000,	10000,		60.082122853762
-0.01,		-100,	-1000,			-9.5785940398132
-0.003333333333,	-1000,	50000,			54.78757726
-0.015,		-1200,	9000,	5000,	1,	11.90373729
-0.015,		-1200,	9000,	5000,	2,	"#NUM!"
-0.015,		0.0,	0.0,	5000,	1,	"#NUM!"
-0.0,		0.0,	-500,	5000,	1,	"#NUM!"
-0.0,		-50,	-250,	150,	1,	-2.0
+#rate		pmt	pv	fv	type	result
+0.01,		-100,	-1000,	10000,	1,	59.673865674295
+0.01,		-100,	-1000,	10000,		60.082122853762
+0.01,		-100,	-1000,			-9.5785940398132
+0.003333333333,	-1000,	50000,			54.78757726
+0.015,		-1200,	9000,	5000,	1,	11.90373729
+0.015,		-1200,	9000,	5000,	2,	"#NUM!"
+0.015,		0.0,	0.0,	5000,	1,	"#NUM!"
+0.0,		0.0,	-500,	5000,	1,	"#NUM!"
+0.0,		-50,	-250,	150,	1,	-2.0
diff --git a/unitTests/rawTestData/Calculation/Financial/NPV.data b/tests/rawTestData/Calculation/Financial/NPV.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/NPV.data
rename to tests/rawTestData/Calculation/Financial/NPV.data
index 41cd8012..c927fa54 100644
--- a/unitTests/rawTestData/Calculation/Financial/NPV.data
+++ b/tests/rawTestData/Calculation/Financial/NPV.data
@@ -1,5 +1,5 @@
-#rate		values					result
-0.10,	-10000,	3000,	4200,	6800,			1188.4434123352
-0.08,	8000,	9200,	10000,	12000,	14500,		41922.061554932
-0.08,	8000,	9200,	10000,	12000,	14500,	-9000,	36250.534912984
-0.05,	2000,	2400,	2900,	3500,	4100,		12678.677633095
+#rate		values					result
+0.10,	-10000,	3000,	4200,	6800,			1188.4434123352
+0.08,	8000,	9200,	10000,	12000,	14500,		41922.061554932
+0.08,	8000,	9200,	10000,	12000,	14500,	-9000,	36250.534912984
+0.05,	2000,	2400,	2900,	3500,	4100,		12678.677633095
diff --git a/unitTests/rawTestData/Calculation/Financial/PRICE.data b/tests/rawTestData/Calculation/Financial/PRICE.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/PRICE.data
rename to tests/rawTestData/Calculation/Financial/PRICE.data
index a1e1edb9..c36be488 100644
--- a/unitTests/rawTestData/Calculation/Financial/PRICE.data
+++ b/tests/rawTestData/Calculation/Financial/PRICE.data
@@ -1,10 +1,10 @@
-#Settlement	Maturity	Rate	Yield	Redemption	Frequency	Basis	Result
-"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		0,	94.6343616213221
-"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		1,	94.6354492078772
-"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		2,	94.6365640300251
-"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		3,	94.6351747967845
-"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		NULL,	110.8344835932160
-"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		1,	110.8345373958590
-"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		2,	110.8344835932160
-"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		3,	110.8345285514390
-"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		4,		3,	110.9217329631980
+#Settlement	Maturity	Rate	Yield	Redemption	Frequency	Basis	Result
+"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		0,	94.6343616213221
+"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		1,	94.6354492078772
+"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		2,	94.6365640300251
+"15-Feb-2008",	"15-Nov-2017",	0.0575,	0.065,	100,		2,		3,	94.6351747967845
+"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		NULL,	110.8344835932160
+"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		1,	110.8345373958590
+"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		2,	110.8344835932160
+"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		2,		3,	110.8345285514390
+"01-Apr-2012",	"31-Mar-2020",	0.12,	0.10,	100,		4,		3,	110.9217329631980
diff --git a/unitTests/rawTestData/Calculation/Financial/RATE.data b/tests/rawTestData/Calculation/Financial/RATE.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Financial/RATE.data
rename to tests/rawTestData/Calculation/Financial/RATE.data
index 3bfe174c..2dd8449e 100644
--- a/unitTests/rawTestData/Calculation/Financial/RATE.data
+++ b/tests/rawTestData/Calculation/Financial/RATE.data
@@ -1,11 +1,11 @@
-#Periods	Payment	Present Value	Future Value	Type	Guess	Result
-48,		-200,	8000,						0.0077014724882014
-60,		-6000,	120000,						0.0467819164224934
-60,		-1000,	120000,						-0.0204429522193565
-24,		-250,	5000,						0.0151308439023434
-24,		-250,	5000,		NULL,		1,		0.0165501190667120
-208,		-700,	8000,						0.0874999976840937
-10,		-1000,	6500,						0.0871137556058636
-6,		-1000,	100000,		-126068,			0.0484721272835728
-6,		1000,	100000,		-126068,			0.0302728738275435
-6,		-1000,	-100000,	126068,		0,		0.0302728738275437
+#Periods	Payment	Present Value	Future Value	Type	Guess	Result
+48,		-200,	8000,						0.0077014724882014
+60,		-6000,	120000,						0.0467819164224934
+60,		-1000,	120000,						-0.0204429522193565
+24,		-250,	5000,						0.0151308439023434
+24,		-250,	5000,		NULL,		1,		0.0165501190667120
+208,		-700,	8000,						0.0874999976840937
+10,		-1000,	6500,						0.0871137556058636
+6,		-1000,	100000,		-126068,			0.0484721272835728
+6,		1000,	100000,		-126068,			0.0302728738275435
+6,		-1000,	-100000,	126068,		0,		0.0302728738275437
diff --git a/unitTests/rawTestData/Calculation/Financial/XIRR.data b/tests/rawTestData/Calculation/Financial/XIRR.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/Financial/XIRR.data
rename to tests/rawTestData/Calculation/Financial/XIRR.data
index 7e3faeee..36a8e23d 100644
--- a/unitTests/rawTestData/Calculation/Financial/XIRR.data
+++ b/tests/rawTestData/Calculation/Financial/XIRR.data
@@ -1,4 +1,4 @@
-#values					dates										guess	Result
-{-10000;2750|4250|3250|2750|46000},	{"2008-01-01";"2008-03-01"|"2008-10-30"|"2009-02-15"|"2009-04-01"},		0.10,	0.373362535
-{-100;20|40|25},			{"2010-01-01";"2010-04-01"|"2010-10-01"|"2011-02-01"},					-0.3024
-{-100;20|40|25|8|15},			{"2010-01-01";"2010-04-01"|"2010-10-01"|"2011-02-01"|"2011-03-01"|"2011-06-01"},	0.2095
+#values					dates										guess	Result
+{-10000;2750|4250|3250|2750|46000},	{"2008-01-01";"2008-03-01"|"2008-10-30"|"2009-02-15"|"2009-04-01"},		0.10,	0.373362535
+{-100;20|40|25},			{"2010-01-01";"2010-04-01"|"2010-10-01"|"2011-02-01"},					-0.3024
+{-100;20|40|25|8|15},			{"2010-01-01";"2010-04-01"|"2010-10-01"|"2011-02-01"|"2011-03-01"|"2011-06-01"},	0.2095
diff --git a/unitTests/rawTestData/Calculation/Functions/ERROR_TYPE.data b/tests/rawTestData/Calculation/Functions/ERROR_TYPE.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/ERROR_TYPE.data
rename to tests/rawTestData/Calculation/Functions/ERROR_TYPE.data
index 5f7a25da..f2722937 100644
--- a/unitTests/rawTestData/Calculation/Functions/ERROR_TYPE.data
+++ b/tests/rawTestData/Calculation/Functions/ERROR_TYPE.data
@@ -1,14 +1,14 @@
-		"#N/A"
-NULL,		"#N/A"
--1,		"#N/A"
-1.25,		"#N/A"
-"",		"#N/A"
-"2.5",		"#N/A"
-TRUE,		"#N/A"
-"#NULL!",	1
-"#DIV/0!",	2
-"#VALUE!",	3
-"#REF!",	4
-"#NAME?",	5
-"#NUM!",	6
-"#N/A",		7
+		"#N/A"
+NULL,		"#N/A"
+-1,		"#N/A"
+1.25,		"#N/A"
+"",		"#N/A"
+"2.5",		"#N/A"
+TRUE,		"#N/A"
+"#NULL!",	1
+"#DIV/0!",	2
+"#VALUE!",	3
+"#REF!",	4
+"#NAME?",	5
+"#NUM!",	6
+"#N/A",		7
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_BLANK.data b/tests/rawTestData/Calculation/Functions/IS_BLANK.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_BLANK.data
rename to tests/rawTestData/Calculation/Functions/IS_BLANK.data
index 13368fea..1daa126d 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_BLANK.data
+++ b/tests/rawTestData/Calculation/Functions/IS_BLANK.data
@@ -1,16 +1,16 @@
-		TRUE
-NULL,		TRUE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	FALSE
-"#N/A",		FALSE
-"TRUE",		FALSE
-TRUE,		FALSE
-FALSE,		FALSE
+		TRUE
+NULL,		TRUE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	FALSE
+"#N/A",		FALSE
+"TRUE",		FALSE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_ERR.data b/tests/rawTestData/Calculation/Functions/IS_ERR.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_ERR.data
rename to tests/rawTestData/Calculation/Functions/IS_ERR.data
index 570af432..e6384d14 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_ERR.data
+++ b/tests/rawTestData/Calculation/Functions/IS_ERR.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	TRUE
-"#N/A",		FALSE
-"TRUE",		FALSE
-TRUE,		FALSE
-FALSE,		FALSE
+		FALSE
+NULL,		FALSE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	TRUE
+"#N/A",		FALSE
+"TRUE",		FALSE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_ERROR.data b/tests/rawTestData/Calculation/Functions/IS_ERROR.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_ERROR.data
rename to tests/rawTestData/Calculation/Functions/IS_ERROR.data
index e1453eb6..244807a1 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_ERROR.data
+++ b/tests/rawTestData/Calculation/Functions/IS_ERROR.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	TRUE
-"#N/A",		TRUE
-"TRUE",		FALSE
-TRUE,		FALSE
-FALSE,		FALSE
+		FALSE
+NULL,		FALSE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	TRUE
+"#N/A",		TRUE
+"TRUE",		FALSE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_EVEN.data b/tests/rawTestData/Calculation/Functions/IS_EVEN.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/Functions/IS_EVEN.data
rename to tests/rawTestData/Calculation/Functions/IS_EVEN.data
index 2c8c708d..8f985df4 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_EVEN.data
+++ b/tests/rawTestData/Calculation/Functions/IS_EVEN.data
@@ -1,20 +1,20 @@
-		"#NAME?"
-NULL,		"#NAME?"
--1,		FALSE
-0,		TRUE
-9,		FALSE
-1.25,		FALSE
-1.5,		FALSE
-2.25,		TRUE
-2.5,		TRUE
-"",		"#VALUE!"
-"-1",		FALSE
-"2",		TRUE
-"-1.5",		FALSE
-"2.5",		TRUE
-"ABC",		"#VALUE!"
-"#VALUE!",	"#VALUE!"
-"#N/A",		"#VALUE!"
-"TRUE",		"#VALUE!"
-TRUE,		"#VALUE!"
-FALSE,		"#VALUE!"
+		"#NAME?"
+NULL,		"#NAME?"
+-1,		FALSE
+0,		TRUE
+9,		FALSE
+1.25,		FALSE
+1.5,		FALSE
+2.25,		TRUE
+2.5,		TRUE
+"",		"#VALUE!"
+"-1",		FALSE
+"2",		TRUE
+"-1.5",		FALSE
+"2.5",		TRUE
+"ABC",		"#VALUE!"
+"#VALUE!",	"#VALUE!"
+"#N/A",		"#VALUE!"
+"TRUE",		"#VALUE!"
+TRUE,		"#VALUE!"
+FALSE,		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_LOGICAL.data b/tests/rawTestData/Calculation/Functions/IS_LOGICAL.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_LOGICAL.data
rename to tests/rawTestData/Calculation/Functions/IS_LOGICAL.data
index 0587b68a..d977ba7b 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_LOGICAL.data
+++ b/tests/rawTestData/Calculation/Functions/IS_LOGICAL.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	FALSE
-"#N/A",		FALSE
-"TRUE",		FALSE
-TRUE,		TRUE
-FALSE,		TRUE
+		FALSE
+NULL,		FALSE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	FALSE
+"#N/A",		FALSE
+"TRUE",		FALSE
+TRUE,		TRUE
+FALSE,		TRUE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_NA.data b/tests/rawTestData/Calculation/Functions/IS_NA.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_NA.data
rename to tests/rawTestData/Calculation/Functions/IS_NA.data
index 5af30133..be96e6bf 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_NA.data
+++ b/tests/rawTestData/Calculation/Functions/IS_NA.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	FALSE
-"#N/A",		TRUE
-"TRUE",		FALSE
-TRUE,		FALSE
-FALSE,		FALSE
+		FALSE
+NULL,		FALSE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	FALSE
+"#N/A",		TRUE
+"TRUE",		FALSE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_NONTEXT.data b/tests/rawTestData/Calculation/Functions/IS_NONTEXT.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_NONTEXT.data
rename to tests/rawTestData/Calculation/Functions/IS_NONTEXT.data
index 3af6f307..223053a2 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_NONTEXT.data
+++ b/tests/rawTestData/Calculation/Functions/IS_NONTEXT.data
@@ -1,16 +1,16 @@
-		TRUE
-NULL,		TRUE
--1,		TRUE
-0,		TRUE
-9,		TRUE
-1.5,		TRUE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	TRUE
-"#N/A",		TRUE
-"TRUE",		FALSE
-TRUE,		TRUE
-FALSE,		TRUE
+		TRUE
+NULL,		TRUE
+-1,		TRUE
+0,		TRUE
+9,		TRUE
+1.5,		TRUE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	TRUE
+"#N/A",		TRUE
+"TRUE",		FALSE
+TRUE,		TRUE
+FALSE,		TRUE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_NUMBER.data b/tests/rawTestData/Calculation/Functions/IS_NUMBER.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_NUMBER.data
rename to tests/rawTestData/Calculation/Functions/IS_NUMBER.data
index 33449f54..525d0fe7 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_NUMBER.data
+++ b/tests/rawTestData/Calculation/Functions/IS_NUMBER.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		TRUE
-0,		TRUE
-9,		TRUE
-1.5,		TRUE
-"",		FALSE
-"-1",		FALSE
-"2",		FALSE
-"-1.5",		FALSE
-"ABC",		FALSE
-"#VALUE!",	FALSE
-"#N/A",		FALSE
-"TRUE",		FALSE
-TRUE,		FALSE
-FALSE,		FALSE
+		FALSE
+NULL,		FALSE
+-1,		TRUE
+0,		TRUE
+9,		TRUE
+1.5,		TRUE
+"",		FALSE
+"-1",		FALSE
+"2",		FALSE
+"-1.5",		FALSE
+"ABC",		FALSE
+"#VALUE!",	FALSE
+"#N/A",		FALSE
+"TRUE",		FALSE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_ODD.data b/tests/rawTestData/Calculation/Functions/IS_ODD.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/Functions/IS_ODD.data
rename to tests/rawTestData/Calculation/Functions/IS_ODD.data
index 34962f54..0cf0741e 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_ODD.data
+++ b/tests/rawTestData/Calculation/Functions/IS_ODD.data
@@ -1,20 +1,20 @@
-		"#NAME?"
-NULL,		"#NAME?"
--1,		TRUE
-0,		FALSE
-9,		TRUE
-1.25,		TRUE
-1.5,		TRUE
-2.25,		FALSE
-2.5,		FALSE
-"",		"#VALUE!"
-"-1",		TRUE
-"2",		FALSE
-"-1.5",		TRUE
-"2.5",		FALSE
-"ABC",		"#VALUE!"
-"#VALUE!",	"#VALUE!"
-"#N/A",		"#VALUE!"
-"TRUE",		"#VALUE!"
-TRUE,		"#VALUE!"
-FALSE,		"#VALUE!"
+		"#NAME?"
+NULL,		"#NAME?"
+-1,		TRUE
+0,		FALSE
+9,		TRUE
+1.25,		TRUE
+1.5,		TRUE
+2.25,		FALSE
+2.5,		FALSE
+"",		"#VALUE!"
+"-1",		TRUE
+"2",		FALSE
+"-1.5",		TRUE
+"2.5",		FALSE
+"ABC",		"#VALUE!"
+"#VALUE!",	"#VALUE!"
+"#N/A",		"#VALUE!"
+"TRUE",		"#VALUE!"
+TRUE,		"#VALUE!"
+FALSE,		"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/Functions/IS_TEXT.data b/tests/rawTestData/Calculation/Functions/IS_TEXT.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Functions/IS_TEXT.data
rename to tests/rawTestData/Calculation/Functions/IS_TEXT.data
index 6c3cb2e1..3f3abf1b 100644
--- a/unitTests/rawTestData/Calculation/Functions/IS_TEXT.data
+++ b/tests/rawTestData/Calculation/Functions/IS_TEXT.data
@@ -1,16 +1,16 @@
-		FALSE
-NULL,		FALSE
--1,		FALSE
-0,		FALSE
-9,		FALSE
-1.5,		FALSE
-"",		TRUE
-"-1",		TRUE
-"2",		TRUE
-"-1.5",		TRUE
-"ABC",		TRUE
-"#VALUE!",	FALSE
-"#N/A",		FALSE
-"TRUE",		TRUE
-TRUE,		FALSE
-FALSE,		FALSE
+		FALSE
+NULL,		FALSE
+-1,		FALSE
+0,		FALSE
+9,		FALSE
+1.5,		FALSE
+"",		TRUE
+"-1",		TRUE
+"2",		TRUE
+"-1.5",		TRUE
+"ABC",		TRUE
+"#VALUE!",	FALSE
+"#N/A",		FALSE
+"TRUE",		TRUE
+TRUE,		FALSE
+FALSE,		FALSE
diff --git a/unitTests/rawTestData/Calculation/Functions/N.data b/tests/rawTestData/Calculation/Functions/N.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/Functions/N.data
rename to tests/rawTestData/Calculation/Functions/N.data
index 107fa4fd..9fc130e0 100644
--- a/unitTests/rawTestData/Calculation/Functions/N.data
+++ b/tests/rawTestData/Calculation/Functions/N.data
@@ -1,20 +1,20 @@
-			0
-NULL,			0
--1,			-1
-1.25,			1.25
-"",			0
-"2.5",			0
-"TRUE",			0
-"ABCDE",		0
-TRUE,			1
-"#DIV/0!",		"#DIV/0!"
-"#NUM!",		"#NUM!"
-{},			0
-{123},			123
-{123|456},		123
-{123|"A"},		123
-{"A"|123},		0
-{"A"|123;456|789},	0
-{123|"A";456|789},	123
-{123|456;"A"|789},	123
-{123|456;789|"A"},	123
+			0
+NULL,			0
+-1,			-1
+1.25,			1.25
+"",			0
+"2.5",			0
+"TRUE",			0
+"ABCDE",		0
+TRUE,			1
+"#DIV/0!",		"#DIV/0!"
+"#NUM!",		"#NUM!"
+{},			0
+{123},			123
+{123|456},		123
+{123|"A"},		123
+{"A"|123},		0
+{"A"|123;456|789},	0
+{123|"A";456|789},	123
+{123|456;"A"|789},	123
+{123|456;789|"A"},	123
diff --git a/unitTests/rawTestData/Calculation/Functions/TYPE.data b/tests/rawTestData/Calculation/Functions/TYPE.data
similarity index 91%
rename from unitTests/rawTestData/Calculation/Functions/TYPE.data
rename to tests/rawTestData/Calculation/Functions/TYPE.data
index 9ad5a51e..52d16880 100644
--- a/unitTests/rawTestData/Calculation/Functions/TYPE.data
+++ b/tests/rawTestData/Calculation/Functions/TYPE.data
@@ -1,16 +1,16 @@
-			1
-NULL,			1
--1,			1
-1.25,			1
-"",			2
-"2.5",			2
-"TRUE",			2
-"ABCDE",		2
-TRUE,			4
-"#DIV/0!",		16
-"#NUM!",		16
-{},			1
-{1},			1
-{1;2;3},		64
-{1|2|3;4|5|6;7|8|9},	64
-{|;|},			64
+			1
+NULL,			1
+-1,			1
+1.25,			1
+"",			2
+"2.5",			2
+"TRUE",			2
+"ABCDE",		2
+TRUE,			4
+"#DIV/0!",		16
+"#NUM!",		16
+{},			1
+{1},			1
+{1;2;3},		64
+{1|2|3;4|5|6;7|8|9},	64
+{|;|},			64
diff --git a/unitTests/rawTestData/Calculation/Logical/AND.data b/tests/rawTestData/Calculation/Logical/AND.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Logical/AND.data
rename to tests/rawTestData/Calculation/Logical/AND.data
index b024b335..76870343 100644
--- a/unitTests/rawTestData/Calculation/Logical/AND.data
+++ b/tests/rawTestData/Calculation/Logical/AND.data
@@ -1,21 +1,21 @@
-"#VALUE!"					//	No arguments
-NULL,	TRUE					//	NULL
-TRUE,	NULL,	TRUE				//	Boolean TRUE and NULL
-FALSE,	NULL,	FALSE				//	Boolean FALSE and NULL
-TRUE,	TRUE,	TRUE				//	Both TRUE Booleans
-TRUE,	FALSE,	FALSE				//	Mixed Booleans
-FALSE,	TRUE,	FALSE				//	Mixed Booleans
-FALSE,	FALSE,	FALSE				//	Both FALSE Booleans
-TRUE,	TRUE,	FALSE,	FALSE			//	Multiple Mixed Booleans
-TRUE,	TRUE,	TRUE,	TRUE			//	Multiple TRUE Booleans
-FALSE,	FALSE,	FALSE,	FALSE,	FALSE		//	Multiple FALSE Booleans
--1,	-2,	TRUE
-0,	0,	FALSE
-0,	1,	FALSE
-1,	1,	TRUE
-"1",1,	"#VALUE!"
-"TRUE",	1,	TRUE				//	'TRUE' String
-"FALSE",TRUE,	FALSE				//	'FALSE' String
-"ABCD",	1,	"#VALUE!"			//	Non-numeric String
--2,	1,	TRUE
--2,	0,	FALSE
+"#VALUE!"					//	No arguments
+NULL,	TRUE					//	NULL
+TRUE,	NULL,	TRUE				//	Boolean TRUE and NULL
+FALSE,	NULL,	FALSE				//	Boolean FALSE and NULL
+TRUE,	TRUE,	TRUE				//	Both TRUE Booleans
+TRUE,	FALSE,	FALSE				//	Mixed Booleans
+FALSE,	TRUE,	FALSE				//	Mixed Booleans
+FALSE,	FALSE,	FALSE				//	Both FALSE Booleans
+TRUE,	TRUE,	FALSE,	FALSE			//	Multiple Mixed Booleans
+TRUE,	TRUE,	TRUE,	TRUE			//	Multiple TRUE Booleans
+FALSE,	FALSE,	FALSE,	FALSE,	FALSE		//	Multiple FALSE Booleans
+-1,	-2,	TRUE
+0,	0,	FALSE
+0,	1,	FALSE
+1,	1,	TRUE
+"1",1,	"#VALUE!"
+"TRUE",	1,	TRUE				//	'TRUE' String
+"FALSE",TRUE,	FALSE				//	'FALSE' String
+"ABCD",	1,	"#VALUE!"			//	Non-numeric String
+-2,	1,	TRUE
+-2,	0,	FALSE
diff --git a/unitTests/rawTestData/Calculation/Logical/IF.data b/tests/rawTestData/Calculation/Logical/IF.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/Logical/IF.data
rename to tests/rawTestData/Calculation/Logical/IF.data
index 304c7f2a..23017b5b 100644
--- a/unitTests/rawTestData/Calculation/Logical/IF.data
+++ b/tests/rawTestData/Calculation/Logical/IF.data
@@ -1,7 +1,7 @@
-0
-TRUE,	0
-FALSE,	FALSE
-TRUE,	"ABC",	"ABC"
-FALSE,	"ABC",	FALSE
-TRUE,	"ABC",	"XYZ",	"ABC"
-FALSE,	"ABC",	"XYZ",	"XYZ"
+0
+TRUE,	0
+FALSE,	FALSE
+TRUE,	"ABC",	"ABC"
+FALSE,	"ABC",	FALSE
+TRUE,	"ABC",	"XYZ",	"ABC"
+FALSE,	"ABC",	"XYZ",	"XYZ"
diff --git a/unitTests/rawTestData/Calculation/Logical/IFERROR.data b/tests/rawTestData/Calculation/Logical/IFERROR.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/Logical/IFERROR.data
rename to tests/rawTestData/Calculation/Logical/IFERROR.data
index 69a85839..2095481f 100644
--- a/unitTests/rawTestData/Calculation/Logical/IFERROR.data
+++ b/tests/rawTestData/Calculation/Logical/IFERROR.data
@@ -1,8 +1,8 @@
-,		"Error",	NULL
-TRUE,		"Error",	TRUE
-42,		"Error",	42
-"",		"Error",	""
-"ABC",		"Error",	"ABC"
-"#VALUE!",	"Error",	"Error"
-"#NAME?",	"Error",	"Error"
-"#N/A",		"Error",	"Error"
+,		"Error",	NULL
+TRUE,		"Error",	TRUE
+42,		"Error",	42
+"",		"Error",	""
+"ABC",		"Error",	"ABC"
+"#VALUE!",	"Error",	"Error"
+"#NAME?",	"Error",	"Error"
+"#N/A",		"Error",	"Error"
diff --git a/unitTests/rawTestData/Calculation/Logical/NOT.data b/tests/rawTestData/Calculation/Logical/NOT.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/Logical/NOT.data
rename to tests/rawTestData/Calculation/Logical/NOT.data
index bed6da05..adc515d8 100644
--- a/unitTests/rawTestData/Calculation/Logical/NOT.data
+++ b/tests/rawTestData/Calculation/Logical/NOT.data
@@ -1,20 +1,20 @@
-TRUE
-NULL,	TRUE
--1,	FALSE
-0,	TRUE
-1,	FALSE
-2,	FALSE
--1.5,	FALSE
-1.5,	FALSE
-"-1",	"#VALUE!"
-"0",	"#VALUE!"
-"1",	"#VALUE!"
-"2",	"#VALUE!"
-"-1.5",	"#VALUE!"
-"1.5",	"#VALUE!"
-"",	"#VALUE!"
-"ABC",	"#VALUE!"
-"FALSE",TRUE
-"TRUE",	FALSE
-TRUE,	FALSE
-FALSE,	TRUE
+TRUE
+NULL,	TRUE
+-1,	FALSE
+0,	TRUE
+1,	FALSE
+2,	FALSE
+-1.5,	FALSE
+1.5,	FALSE
+"-1",	"#VALUE!"
+"0",	"#VALUE!"
+"1",	"#VALUE!"
+"2",	"#VALUE!"
+"-1.5",	"#VALUE!"
+"1.5",	"#VALUE!"
+"",	"#VALUE!"
+"ABC",	"#VALUE!"
+"FALSE",TRUE
+"TRUE",	FALSE
+TRUE,	FALSE
+FALSE,	TRUE
diff --git a/unitTests/rawTestData/Calculation/Logical/OR.data b/tests/rawTestData/Calculation/Logical/OR.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/Logical/OR.data
rename to tests/rawTestData/Calculation/Logical/OR.data
index 9c2a7d08..738916ee 100644
--- a/unitTests/rawTestData/Calculation/Logical/OR.data
+++ b/tests/rawTestData/Calculation/Logical/OR.data
@@ -1,20 +1,20 @@
-"#VALUE!"				//	No arguments
-NULL,	FALSE				//	NULL
-TRUE,	NULL,	TRUE			//	Boolean TRUE and NULL
-FALSE,	NULL,	FALSE			//	Boolean FALSE and NULL
-TRUE,	TRUE,	TRUE			//	Both TRUE Booleans
-TRUE,	FALSE,	TRUE			//	Mixed Booleans
-FALSE,	TRUE,	TRUE			//	Mixed Booleans
-FALSE,	FALSE,	FALSE			//	Both FALSE Booleans
-TRUE,	TRUE,	FALSE,	TRUE		//	Multiple Mixed Booleans
-TRUE,	TRUE,	TRUE,	TRUE		//	Multiple TRUE Booleans
-FALSE,	FALSE,	FALSE,	FALSE,	FALSE	//	Multiple FALSE Booleans
--1,	-2,	TRUE
-0,	0,	FALSE
-0,	1,	TRUE
-1,	1,	TRUE
-"TRUE",	1,	TRUE			//	'TRUE' String
-"FALSE",TRUE,	TRUE			//	'FALSE' String
-"ABCD",	1,	"#VALUE!"		//	Non-numeric String
--2,	1,	TRUE
--2,	0,	TRUE
+"#VALUE!"				//	No arguments
+NULL,	FALSE				//	NULL
+TRUE,	NULL,	TRUE			//	Boolean TRUE and NULL
+FALSE,	NULL,	FALSE			//	Boolean FALSE and NULL
+TRUE,	TRUE,	TRUE			//	Both TRUE Booleans
+TRUE,	FALSE,	TRUE			//	Mixed Booleans
+FALSE,	TRUE,	TRUE			//	Mixed Booleans
+FALSE,	FALSE,	FALSE			//	Both FALSE Booleans
+TRUE,	TRUE,	FALSE,	TRUE		//	Multiple Mixed Booleans
+TRUE,	TRUE,	TRUE,	TRUE		//	Multiple TRUE Booleans
+FALSE,	FALSE,	FALSE,	FALSE,	FALSE	//	Multiple FALSE Booleans
+-1,	-2,	TRUE
+0,	0,	FALSE
+0,	1,	TRUE
+1,	1,	TRUE
+"TRUE",	1,	TRUE			//	'TRUE' String
+"FALSE",TRUE,	TRUE			//	'FALSE' String
+"ABCD",	1,	"#VALUE!"		//	Non-numeric String
+-2,	1,	TRUE
+-2,	0,	TRUE
diff --git a/unitTests/rawTestData/Calculation/LookupRef/HLOOKUP.data b/tests/rawTestData/Calculation/LookupRef/HLOOKUP.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/LookupRef/HLOOKUP.data
rename to tests/rawTestData/Calculation/LookupRef/HLOOKUP.data
diff --git a/unitTests/rawTestData/Calculation/LookupRef/VLOOKUP.data b/tests/rawTestData/Calculation/LookupRef/VLOOKUP.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/LookupRef/VLOOKUP.data
rename to tests/rawTestData/Calculation/LookupRef/VLOOKUP.data
diff --git a/unitTests/rawTestData/Calculation/MathTrig/ATAN2.data b/tests/rawTestData/Calculation/MathTrig/ATAN2.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/ATAN2.data
rename to tests/rawTestData/Calculation/MathTrig/ATAN2.data
index 614645ca..47dade23 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/ATAN2.data
+++ b/tests/rawTestData/Calculation/MathTrig/ATAN2.data
@@ -1,17 +1,17 @@
-#x_num	y_num	Result
-0,	0,	"#DIV/0!"
-1,	1,	0.785398163397
--1,	-1,	-2.356194490192
--1,	1,	2.356194490192
-1,	-1,	-0.785398163397
-0.5,	1,	1.107148717794
--0.5,	2,	1.815774989922
-1,	0.8,	0.674740942224
-0.8,	-0.6,	-0.643501108793
-1,	-9,	-1.460139105621
-0.2,	0,	0.0
-0.1,	0.2,	1.107148717794
-0,	0.2,	1.570796326795
-"A",	0.2,	"#VALUE!"
-TRUE,	1,	0.785398163397
-FALSE,	-2.5,	-1.570796326795
+#x_num	y_num	Result
+0,	0,	"#DIV/0!"
+1,	1,	0.785398163397
+-1,	-1,	-2.356194490192
+-1,	1,	2.356194490192
+1,	-1,	-0.785398163397
+0.5,	1,	1.107148717794
+-0.5,	2,	1.815774989922
+1,	0.8,	0.674740942224
+0.8,	-0.6,	-0.643501108793
+1,	-9,	-1.460139105621
+0.2,	0,	0.0
+0.1,	0.2,	1.107148717794
+0,	0.2,	1.570796326795
+"A",	0.2,	"#VALUE!"
+TRUE,	1,	0.785398163397
+FALSE,	-2.5,	-1.570796326795
diff --git a/unitTests/rawTestData/Calculation/MathTrig/CEILING.data b/tests/rawTestData/Calculation/MathTrig/CEILING.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/MathTrig/CEILING.data
rename to tests/rawTestData/Calculation/MathTrig/CEILING.data
index 23c263a0..ed46ca8b 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/CEILING.data
+++ b/tests/rawTestData/Calculation/MathTrig/CEILING.data
@@ -1,21 +1,21 @@
-#number		significance	result
-2.5,		1,		3.0
--2.5,		-2,		-4.0
-1.5,		0.1,		1.5
-0.234,		0.01,		0.24
--2.341,		-0.1,		-2.4
-8,		0,		0.0
-8,		1.5,		9.0
-8,		-1.5,		"#NUM!"
--8,		1.5,		"#NUM!"
--8,		-1.5,		-9.0
-8.26,		0.05,		8.3
-2.341,		0.05,		2.35
-123.456,			"#VALUE!"
-"PHPExcel",			"#VALUE!"
-210.67,		1,		211.0
-210.67,		0.05,		210.70
-210.63,		0.05,		210.65
-2.98,		2,		4.0
--2.98,		2,		"#NUM!"
--4.5,		-1,		-5.0
+#number		significance	result
+2.5,		1,		3.0
+-2.5,		-2,		-4.0
+1.5,		0.1,		1.5
+0.234,		0.01,		0.24
+-2.341,		-0.1,		-2.4
+8,		0,		0.0
+8,		1.5,		9.0
+8,		-1.5,		"#NUM!"
+-8,		1.5,		"#NUM!"
+-8,		-1.5,		-9.0
+8.26,		0.05,		8.3
+2.341,		0.05,		2.35
+123.456,			"#VALUE!"
+"PHPExcel",			"#VALUE!"
+210.67,		1,		211.0
+210.67,		0.05,		210.70
+210.63,		0.05,		210.65
+2.98,		2,		4.0
+-2.98,		2,		"#NUM!"
+-4.5,		-1,		-5.0
diff --git a/unitTests/rawTestData/Calculation/MathTrig/COMBIN.data b/tests/rawTestData/Calculation/MathTrig/COMBIN.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/MathTrig/COMBIN.data
rename to tests/rawTestData/Calculation/MathTrig/COMBIN.data
index 0b34f757..568ad14d 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/COMBIN.data
+++ b/tests/rawTestData/Calculation/MathTrig/COMBIN.data
@@ -1,25 +1,25 @@
-#NumObjs	NumInSet	Result
-7,		3,		35
-8,		2,		28
-8,		3,		56
-8,		4,		70
-100,		3,		161700
--7,		-10,		"#NUM!"
--7,		10,		"#NUM!"
-7,		-10,		"#NUM!"
-2,		3,		"#NUM!"
-2,		2,		1
-2,		1,		2
-2,		0,		1
-2.5,		2,		1
-"ABCD",		"EFGH",		"#VALUE!"
-10,		5,		252
-10,		3,		120
-21,		5,		20349
-6,		1,		6
-6,		2,		15
-6,		3,		20
-6,		4,		15
-6,		5,		6
-6,		6,		1
-6,		7,		"#NUM!"
+#NumObjs	NumInSet	Result
+7,		3,		35
+8,		2,		28
+8,		3,		56
+8,		4,		70
+100,		3,		161700
+-7,		-10,		"#NUM!"
+-7,		10,		"#NUM!"
+7,		-10,		"#NUM!"
+2,		3,		"#NUM!"
+2,		2,		1
+2,		1,		2
+2,		0,		1
+2.5,		2,		1
+"ABCD",		"EFGH",		"#VALUE!"
+10,		5,		252
+10,		3,		120
+21,		5,		20349
+6,		1,		6
+6,		2,		15
+6,		3,		20
+6,		4,		15
+6,		5,		6
+6,		6,		1
+6,		7,		"#NUM!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/EVEN.data b/tests/rawTestData/Calculation/MathTrig/EVEN.data
similarity index 88%
rename from unitTests/rawTestData/Calculation/MathTrig/EVEN.data
rename to tests/rawTestData/Calculation/MathTrig/EVEN.data
index 9254a74d..604533c2 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/EVEN.data
+++ b/tests/rawTestData/Calculation/MathTrig/EVEN.data
@@ -1,17 +1,17 @@
-,	0
-5.4,	6
--5.4,	-6
-1.5,	2
-0.1,	2
-3,	4
-2,	2
--2,	-2
--1,	-2
-"ABC",	"#VALUE!"
-TRUE,	2
-FALSE,	0
-0,	0
-210.61,	212
-2.98,	4
--2.98,	-4
-6,	6
+,	0
+5.4,	6
+-5.4,	-6
+1.5,	2
+0.1,	2
+3,	4
+2,	2
+-2,	-2
+-1,	-2
+"ABC",	"#VALUE!"
+TRUE,	2
+FALSE,	0
+0,	0
+210.61,	212
+2.98,	4
+-2.98,	-4
+6,	6
diff --git a/unitTests/rawTestData/Calculation/MathTrig/FACT.data b/tests/rawTestData/Calculation/MathTrig/FACT.data
similarity index 89%
rename from unitTests/rawTestData/Calculation/MathTrig/FACT.data
rename to tests/rawTestData/Calculation/MathTrig/FACT.data
index 423971dc..6340f6c1 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/FACT.data
+++ b/tests/rawTestData/Calculation/MathTrig/FACT.data
@@ -1,10 +1,10 @@
-5,	120
-1.9,	1
-0,	1
--4,	"#NUM!"
-1,	1
-3,	6
-6,	720
-10,	3628800
-3.2,	6
-"ABC",	"#VALUE!"
+5,	120
+1.9,	1
+0,	1
+-4,	"#NUM!"
+1,	1
+3,	6
+6,	720
+10,	3628800
+3.2,	6
+"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data b/tests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data
similarity index 89%
rename from unitTests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data
rename to tests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data
index 03c3108a..81ee2e94 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data
+++ b/tests/rawTestData/Calculation/MathTrig/FACTDOUBLE.data
@@ -1,8 +1,8 @@
-0,	1
-6,	48
-7,	105
-5,	15
-8,	384
-13,	135135
--1,	"#NUM!"
-"ABC",	"#VALUE!"
+0,	1
+6,	48
+7,	105
+5,	15
+8,	384
+13,	135135
+-1,	"#NUM!"
+"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/FLOOR.data b/tests/rawTestData/Calculation/MathTrig/FLOOR.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/MathTrig/FLOOR.data
rename to tests/rawTestData/Calculation/MathTrig/FLOOR.data
index 9bcf1dad..29785f72 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/FLOOR.data
+++ b/tests/rawTestData/Calculation/MathTrig/FLOOR.data
@@ -1,11 +1,11 @@
-2.5,	1,	2
--2.5,	-2,	-2
--2.5,	2,	"#NUM!"
-2.5,	-2,	"#NUM!"
-123.456,0,	"#DIV/0!"
-1.5,	0.1,	1.5
-0.234,	0.01,	0.23
-123.456,	"#VALUE!"
-"ABC",		"#VALUE!"
-17,	3,	15
-19,	4,	16
+2.5,	1,	2
+-2.5,	-2,	-2
+-2.5,	2,	"#NUM!"
+2.5,	-2,	"#NUM!"
+123.456,0,	"#DIV/0!"
+1.5,	0.1,	1.5
+0.234,	0.01,	0.23
+123.456,	"#VALUE!"
+"ABC",		"#VALUE!"
+17,	3,	15
+19,	4,	16
diff --git a/unitTests/rawTestData/Calculation/MathTrig/GCD.data b/tests/rawTestData/Calculation/MathTrig/GCD.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/MathTrig/GCD.data
rename to tests/rawTestData/Calculation/MathTrig/GCD.data
index 68d1deb7..ca673481 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/GCD.data
+++ b/tests/rawTestData/Calculation/MathTrig/GCD.data
@@ -1,20 +1,20 @@
-5,	2,		1
-24,	36,		12
-7,	1,		1
-5,	0,		5
-30,	15,	10,	5
-42,	56,	140,	14
-24,	28,	40,	4
-27,	45,	54,	9
-84,	126,	196,	14
-3,	5,	7,	1
-3,	5,	0,	1
-3,	5,	-7,	"#NUM!"
-3,	6,	12,	3
-3,	6,	"12",	3
-3,	6,	"ABC",	"#VALUE!"
-3,			3
-15,	10,	25,	5
-0,	8,	12,	4
-7,	2,		1
-0,	0,		0
+5,	2,		1
+24,	36,		12
+7,	1,		1
+5,	0,		5
+30,	15,	10,	5
+42,	56,	140,	14
+24,	28,	40,	4
+27,	45,	54,	9
+84,	126,	196,	14
+3,	5,	7,	1
+3,	5,	0,	1
+3,	5,	-7,	"#NUM!"
+3,	6,	12,	3
+3,	6,	"12",	3
+3,	6,	"ABC",	"#VALUE!"
+3,			3
+15,	10,	25,	5
+0,	8,	12,	4
+7,	2,		1
+0,	0,		0
diff --git a/unitTests/rawTestData/Calculation/MathTrig/INT.data b/tests/rawTestData/Calculation/MathTrig/INT.data
similarity index 88%
rename from unitTests/rawTestData/Calculation/MathTrig/INT.data
rename to tests/rawTestData/Calculation/MathTrig/INT.data
index e05797e4..b5d8cd5c 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/INT.data
+++ b/tests/rawTestData/Calculation/MathTrig/INT.data
@@ -1,19 +1,19 @@
-,	0
-5.4,	5
--5.4,	-6
--3.2,	-4
-1.5,	1
-0.1,	0
--0.1,	-1
-3,	3
-2,	2
--2.01,	-3
--2,	-2
--1,	-1
-"ABC",	"#VALUE!"
-TRUE,	1
-FALSE,	0
-0,	0
-"-3.5",	-4
-8.9,	8
--8.9,	-9
+,	0
+5.4,	5
+-5.4,	-6
+-3.2,	-4
+1.5,	1
+0.1,	0
+-0.1,	-1
+3,	3
+2,	2
+-2.01,	-3
+-2,	-2
+-1,	-1
+"ABC",	"#VALUE!"
+TRUE,	1
+FALSE,	0
+0,	0
+"-3.5",	-4
+8.9,	8
+-8.9,	-9
diff --git a/unitTests/rawTestData/Calculation/MathTrig/LCM.data b/tests/rawTestData/Calculation/MathTrig/LCM.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/MathTrig/LCM.data
rename to tests/rawTestData/Calculation/MathTrig/LCM.data
index 327253fa..8f402684 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/LCM.data
+++ b/tests/rawTestData/Calculation/MathTrig/LCM.data
@@ -1,12 +1,12 @@
-5,	2,		10
-24,	36,		72
-3,	7,	12,	84
-24.9,	36.9,		72
-6,	22,	121,	726
-6,	"ABC",		"#VALUE!"
-24,	-12,		"#NUM!"
-3,	0,		0
-1,	5,		5
-15,	10,	25,	150
-1,	8,	12,	24
-7,	2,		14
+5,	2,		10
+24,	36,		72
+3,	7,	12,	84
+24.9,	36.9,		72
+6,	22,	121,	726
+6,	"ABC",		"#VALUE!"
+24,	-12,		"#NUM!"
+3,	0,		0
+1,	5,		5
+15,	10,	25,	150
+1,	8,	12,	24
+7,	2,		14
diff --git a/unitTests/rawTestData/Calculation/MathTrig/LOG.data b/tests/rawTestData/Calculation/MathTrig/LOG.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/LOG.data
rename to tests/rawTestData/Calculation/MathTrig/LOG.data
index bfea379f..219ac59e 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/LOG.data
+++ b/tests/rawTestData/Calculation/MathTrig/LOG.data
@@ -1,70 +1,70 @@
-#number	base		result
-"ABC",			"#VALUE!"
-"123ABC",		"#VALUE!"
-1.2345,			0.0914910942679511
--1.5,	-0.75,		"#NUM!"
-0,	-0.75,		"#NUM!"
-3.75,	-0.75,		"#NUM!"
--1.5,	0,		"#NUM!"
-0,	0,		"#NUM!"
-3.75,	0,		"#NUM!"
--0.75,	0.75,		"#NUM!"
-0,	0.75,		"#NUM!"
-0.75,	0.75,		1.0
-1.5,	0.75,		-1.4094208396532100
-2.25,	0.75,		-2.8188416793064200
-3,	0.75,		-3.8188416793064200
-3.75,	0.75,		-4.5945019399978900
-4.5,	0.75,		-5.2282625189596300
--0.75,	1.5,		"#NUM!"
-0,	1.5,		"#NUM!"
-0.75,	1.5,		-0.7095112913514550
-1.5,	1.5,		1.0
-2.25,	1.5,		2.0
-3,	1.5,		2.7095112913514500
-3.75,	1.5,		3.2598510045646600
-4.5,	1.5,		3.7095112913514500
--0.75,	2.25,		"#NUM!"
-0,	2.25,		"#NUM!"
-0.75,	2.25,		-0.3547556456757270
-1.5,	2.25,		0.5
-2.25,	2.25,		1.0
-3,	2.25,		1.3547556456757300
-3.75,	2.25,		1.6299255022823300
-4.5,	2.25,		1.8547556456757300
--0.75,	3,		"#NUM!"
-0,	3,		"#NUM!"
-0.75,	3,		-0.2618595071429150
-1.5,	3,		0.3690702464285430
-2.25,	3,		0.7381404928570850
-3,	3,		1.0
-3.75,	3,		1.2031140135750100
-4.5,	3,		1.3690702464285400
--0.75,	3.75,		"#NUM!"
-0,	3.75,		"#NUM!"
-0.75,	3.75,		-0.2176514479827300
-1.5,	3.75,		0.3067624865675560
-2.25,	3.75,		0.6135249731351110
-3,	3.75,		0.8311764211178410
-3.75,	3.75,		1.0
-4.5,	3.75,		1.1379389076854000
--0.75,	4.5,		"#NUM!"
-0,	4.5,		"#NUM!"
-0.75,	4.5,		-0.1912681309275550
-1.5,	4.5,		0.2695772896908150
-2.25,	4.5,		0.5391545793816300
-3,	4.5,		0.7304227103091850
-3.75,	4.5,		0.8787817986064220
-4.5,	4.5,		1.0
-64,	2,		6
-100,			2
-4,	0.5,		-2
-500,			2.698970004336
-10,			1
-8,	2,		3
-86,	2.7182818,	4.454347342888
-20,			1.301029995664
-20,	10,		1.301029995664
-20,	25,		0.930676558073
-25,	5.1,		1.975690971574
-200,	3,		4.822736302150
+#number	base		result
+"ABC",			"#VALUE!"
+"123ABC",		"#VALUE!"
+1.2345,			0.0914910942679511
+-1.5,	-0.75,		"#NUM!"
+0,	-0.75,		"#NUM!"
+3.75,	-0.75,		"#NUM!"
+-1.5,	0,		"#NUM!"
+0,	0,		"#NUM!"
+3.75,	0,		"#NUM!"
+-0.75,	0.75,		"#NUM!"
+0,	0.75,		"#NUM!"
+0.75,	0.75,		1.0
+1.5,	0.75,		-1.4094208396532100
+2.25,	0.75,		-2.8188416793064200
+3,	0.75,		-3.8188416793064200
+3.75,	0.75,		-4.5945019399978900
+4.5,	0.75,		-5.2282625189596300
+-0.75,	1.5,		"#NUM!"
+0,	1.5,		"#NUM!"
+0.75,	1.5,		-0.7095112913514550
+1.5,	1.5,		1.0
+2.25,	1.5,		2.0
+3,	1.5,		2.7095112913514500
+3.75,	1.5,		3.2598510045646600
+4.5,	1.5,		3.7095112913514500
+-0.75,	2.25,		"#NUM!"
+0,	2.25,		"#NUM!"
+0.75,	2.25,		-0.3547556456757270
+1.5,	2.25,		0.5
+2.25,	2.25,		1.0
+3,	2.25,		1.3547556456757300
+3.75,	2.25,		1.6299255022823300
+4.5,	2.25,		1.8547556456757300
+-0.75,	3,		"#NUM!"
+0,	3,		"#NUM!"
+0.75,	3,		-0.2618595071429150
+1.5,	3,		0.3690702464285430
+2.25,	3,		0.7381404928570850
+3,	3,		1.0
+3.75,	3,		1.2031140135750100
+4.5,	3,		1.3690702464285400
+-0.75,	3.75,		"#NUM!"
+0,	3.75,		"#NUM!"
+0.75,	3.75,		-0.2176514479827300
+1.5,	3.75,		0.3067624865675560
+2.25,	3.75,		0.6135249731351110
+3,	3.75,		0.8311764211178410
+3.75,	3.75,		1.0
+4.5,	3.75,		1.1379389076854000
+-0.75,	4.5,		"#NUM!"
+0,	4.5,		"#NUM!"
+0.75,	4.5,		-0.1912681309275550
+1.5,	4.5,		0.2695772896908150
+2.25,	4.5,		0.5391545793816300
+3,	4.5,		0.7304227103091850
+3.75,	4.5,		0.8787817986064220
+4.5,	4.5,		1.0
+64,	2,		6
+100,			2
+4,	0.5,		-2
+500,			2.698970004336
+10,			1
+8,	2,		3
+86,	2.7182818,	4.454347342888
+20,			1.301029995664
+20,	10,		1.301029995664
+20,	25,		0.930676558073
+25,	5.1,		1.975690971574
+200,	3,		4.822736302150
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MDETERM.data b/tests/rawTestData/Calculation/MathTrig/MDETERM.data
similarity index 97%
rename from unitTests/rawTestData/Calculation/MathTrig/MDETERM.data
rename to tests/rawTestData/Calculation/MathTrig/MDETERM.data
index c1d3a3fa..970bec53 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MDETERM.data
+++ b/tests/rawTestData/Calculation/MathTrig/MDETERM.data
@@ -1,14 +1,14 @@
-{1|2|3;4|5|6;7|8|9},			6.661338147750940E-16
-{1.1|2.2|3.3;4.4|5.5|6.6;7.7|8.8|9.9},	1.61204383175573E-15
-{10|20|30;40|50|60;70|80|90},		-4.26325641456060E-12
-{8|1|6;3|5|7;4|9|2},			-3.6E+02
-{5|2;7|1},				-9
-{6|4|2;3|5|3;2|3|4},			40
-{0.2|1;0.35|10.8},			1.81
-{0.2|1|-0.9;0.35|10.8|4;-3.15|5|},	"#VALUE!"
-{1|2;3|4},				-2
-{1|2|1;3|4|2;1|1|2},			-3
-{1|3|8|5;1|3|6|1;1|1|1|0;7|3|10|2},	88
-{3|6|1;1|1|0;3|10|2},			1
-{3|6;1|1},				-3
-{1|3|8|5;1|3|6|1},			"#VALUE!"
+{1|2|3;4|5|6;7|8|9},			6.661338147750940E-16
+{1.1|2.2|3.3;4.4|5.5|6.6;7.7|8.8|9.9},	1.61204383175573E-15
+{10|20|30;40|50|60;70|80|90},		-4.26325641456060E-12
+{8|1|6;3|5|7;4|9|2},			-3.6E+02
+{5|2;7|1},				-9
+{6|4|2;3|5|3;2|3|4},			40
+{0.2|1;0.35|10.8},			1.81
+{0.2|1|-0.9;0.35|10.8|4;-3.15|5|},	"#VALUE!"
+{1|2;3|4},				-2
+{1|2|1;3|4|2;1|1|2},			-3
+{1|3|8|5;1|3|6|1;1|1|1|0;7|3|10|2},	88
+{3|6|1;1|1|0;3|10|2},			1
+{3|6;1|1},				-3
+{1|3|8|5;1|3|6|1},			"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data b/tests/rawTestData/Calculation/MathTrig/MINVERSE.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data
rename to tests/rawTestData/Calculation/MathTrig/MINVERSE.data
index 40ee4284..8c9a962f 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MINVERSE.data
+++ b/tests/rawTestData/Calculation/MathTrig/MINVERSE.data
@@ -1,15 +1,15 @@
-{1|2|3;4|5|6;7|8|9},    {-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15;9.00719925474100E+15|-1.80143985094820E+16|9.00719925474099E+15;-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15}
-{10|20|30;40|50|60;70|80|90},		{7.03687441776639E+13|-1.40737488355328E+14|7.03687441776640E+13;-1.40737488355328E+14|2.81474976710656E+14|-1.40737488355328E+14;7.03687441776641E+13|-1.40737488355328E+14|7.03687441776640E+13}
-{8|1|6;3|5|7;4|9|2},			{1.47222222222222E-01|-1.44444444444444E-01|6.38888888888889E-02;-6.11111111111111E-02|2.22222222222222E-02|1.05555555555556E-01;-1.94444444444444E-02|1.88888888888889E-01|-1.02777777777778E-01}
-{4|-1;2|0},				{0|0.5;-1|2}
-{1|2|1;3|4|-1;0|2|0},			{0.25|0.25|-0.75;0|0|0.5;0.75|-0.25|-0.25}
-{1|4|1|1;1|4|0|1;2|3|1|2;3|2|6|4},	{3.2|-4.8|2.8|-1;0.2|0.2|0.2|0;1|-1|0|0;-4|5|-2|1}
-{0.2|1;0.35|10.8},			{5.96685082872928|-0.55248618784530;-0.19337016574586|0.11049723756906}
-{0.2|1|-0.9;0.35|10.8|4;-3.15|5},	"#VALUE!"
-{1|2;3|4},				{-2|1;1.5|-0.5}
-{1|2|1;3|4|2;1|1|2},			{-2|1|0;1.33333333333333|-0.33333333333333|-0.33333333333333;0.33333333333333|-0.33333333333333|0.66666666666667}
-{2|3;4|5},   {-2.5|1.5;2|-1}
-{5|8;7|9},  {-0.818181818181818|0.727272727272727;0.636363636363636|-0.454545454545455}
-{45|78;17|50},  {0.054112554112554|-0.084415584415584;-0.018398268398268|0.048701298701299}
-{2|2;2|1},   {-0.5|1.0;1|-1}
+{1|2|3;4|5|6;7|8|9},    {-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15;9.00719925474100E+15|-1.80143985094820E+16|9.00719925474099E+15;-4.50359962737050E+15|9.00719925474099E+15|-4.50359962737050E+15}
+{10|20|30;40|50|60;70|80|90},		{7.03687441776639E+13|-1.40737488355328E+14|7.03687441776640E+13;-1.40737488355328E+14|2.81474976710656E+14|-1.40737488355328E+14;7.03687441776641E+13|-1.40737488355328E+14|7.03687441776640E+13}
+{8|1|6;3|5|7;4|9|2},			{1.47222222222222E-01|-1.44444444444444E-01|6.38888888888889E-02;-6.11111111111111E-02|2.22222222222222E-02|1.05555555555556E-01;-1.94444444444444E-02|1.88888888888889E-01|-1.02777777777778E-01}
+{4|-1;2|0},				{0|0.5;-1|2}
+{1|2|1;3|4|-1;0|2|0},			{0.25|0.25|-0.75;0|0|0.5;0.75|-0.25|-0.25}
+{1|4|1|1;1|4|0|1;2|3|1|2;3|2|6|4},	{3.2|-4.8|2.8|-1;0.2|0.2|0.2|0;1|-1|0|0;-4|5|-2|1}
+{0.2|1;0.35|10.8},			{5.96685082872928|-0.55248618784530;-0.19337016574586|0.11049723756906}
+{0.2|1|-0.9;0.35|10.8|4;-3.15|5},	"#VALUE!"
+{1|2;3|4},				{-2|1;1.5|-0.5}
+{1|2|1;3|4|2;1|1|2},			{-2|1|0;1.33333333333333|-0.33333333333333|-0.33333333333333;0.33333333333333|-0.33333333333333|0.66666666666667}
+{2|3;4|5},   {-2.5|1.5;2|-1}
+{5|8;7|9},  {-0.818181818181818|0.727272727272727;0.636363636363636|-0.454545454545455}
+{45|78;17|50},  {0.054112554112554|-0.084415584415584;-0.018398268398268|0.048701298701299}
+{2|2;2|1},   {-0.5|1.0;1|-1}
 {1|4|6;7|4|10;15|16|20},    {-0.2941176470588230|0.0588235294117647|0.0588235294117647;0.0367647058823529|-0.2573529411764710|0.1176470588235290;0.1911764705882350|0.1617647058823530|-0.0882352941176471}
\ No newline at end of file
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MMULT.data b/tests/rawTestData/Calculation/MathTrig/MMULT.data
similarity index 98%
rename from unitTests/rawTestData/Calculation/MathTrig/MMULT.data
rename to tests/rawTestData/Calculation/MathTrig/MMULT.data
index 06af83a0..86c9bfdb 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MMULT.data
+++ b/tests/rawTestData/Calculation/MathTrig/MMULT.data
@@ -1,12 +1,12 @@
-{1|2;3|4},		{1|2;3|4},		{7|10;15|22}
-{1|2|3;4|5|6;7|8|9},	{1|2|3;4|5|6;7|8|9},	{30|36|42;66|81|96;102|126|150}
-{1|2;3|4},		2,			"#VALUE!"   // Mismatched dimensions
-{1|2;3|4},		{2},			"#VALUE!"   // Mismatched dimensions
-{1.2;2.4},      {3.6|4.5},          {14.43|14.43;14.43|14.43}
-2,			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
-{2},			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
-{1|2;3|4},		{2|4},			"#VALUE!"
-{1|2;3|4},		{2;4},			{{10};{22}}
-{2|4},			{1|2;3|4},		{14|20}
-{2;4},			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
-{1|2;3|4;5|6},		{1|2|3;4|5|6},		{9|12|15;19|26|33;29|40|51}
+{1|2;3|4},		{1|2;3|4},		{7|10;15|22}
+{1|2|3;4|5|6;7|8|9},	{1|2|3;4|5|6;7|8|9},	{30|36|42;66|81|96;102|126|150}
+{1|2;3|4},		2,			"#VALUE!"   // Mismatched dimensions
+{1|2;3|4},		{2},			"#VALUE!"   // Mismatched dimensions
+{1.2;2.4},      {3.6|4.5},          {14.43|14.43;14.43|14.43}
+2,			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
+{2},			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
+{1|2;3|4},		{2|4},			"#VALUE!"
+{1|2;3|4},		{2;4},			{{10};{22}}
+{2|4},			{1|2;3|4},		{14|20}
+{2;4},			{1|2;3|4},		"#VALUE!"   // Mismatched dimensions
+{1|2;3|4;5|6},		{1|2|3;4|5|6},		{9|12|15;19|26|33;29|40|51}
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MOD.data b/tests/rawTestData/Calculation/MathTrig/MOD.data
similarity index 91%
rename from unitTests/rawTestData/Calculation/MathTrig/MOD.data
rename to tests/rawTestData/Calculation/MathTrig/MOD.data
index efcd4880..7e0aee6f 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MOD.data
+++ b/tests/rawTestData/Calculation/MathTrig/MOD.data
@@ -1,9 +1,9 @@
-19,	17,	2
-19,	-13,	-7
-34,	17,	0
-34,	0,	"#DIV/0!"
-3,	2,	1
--3,	2,	1
-3,	-2,	-1
--3,	-2,	-1
-2.5,	1.3,	1.2
+19,	17,	2
+19,	-13,	-7
+34,	17,	0
+34,	0,	"#DIV/0!"
+3,	2,	1
+-3,	2,	1
+3,	-2,	-1
+-3,	-2,	-1
+2.5,	1.3,	1.2
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MROUND.data b/tests/rawTestData/Calculation/MathTrig/MROUND.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/MathTrig/MROUND.data
rename to tests/rawTestData/Calculation/MathTrig/MROUND.data
index 3a9a5603..fc68ed7b 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MROUND.data
+++ b/tests/rawTestData/Calculation/MathTrig/MROUND.data
@@ -1,11 +1,11 @@
-10,		3,	9
--10,		-3,	-9
-1.3,		0.2,	1.4
-5,		0,	0
-3.14159,	0.002,	3.142
--3.14159,	-.02,	-3.14
-31415.92654,	10,	31420
-31415.92654,	1,	31416
-5,		-2,	"#NUM!"
-"ABC",		1,	"#VALUE!"
-1.234,		"ABC",	"#VALUE!"
+10,		3,	9
+-10,		-3,	-9
+1.3,		0.2,	1.4
+5,		0,	0
+3.14159,	0.002,	3.142
+-3.14159,	-.02,	-3.14
+31415.92654,	10,	31420
+31415.92654,	1,	31416
+5,		-2,	"#NUM!"
+"ABC",		1,	"#VALUE!"
+1.234,		"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data b/tests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data
rename to tests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data
index bb742bb2..c943f20a 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data
+++ b/tests/rawTestData/Calculation/MathTrig/MULTINOMIAL.data
@@ -1,2 +1,2 @@
-2,	3,	4,		1260
-3,	1,	2,	5,	27720
+2,	3,	4,		1260
+3,	1,	2,	5,	27720
diff --git a/unitTests/rawTestData/Calculation/MathTrig/ODD.data b/tests/rawTestData/Calculation/MathTrig/ODD.data
similarity index 88%
rename from unitTests/rawTestData/Calculation/MathTrig/ODD.data
rename to tests/rawTestData/Calculation/MathTrig/ODD.data
index 37e05464..54898cc1 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/ODD.data
+++ b/tests/rawTestData/Calculation/MathTrig/ODD.data
@@ -1,13 +1,13 @@
-,	1
-5.4,	7
--5.4,	-7
-1.5,	3
-0.1,	1
-3,	3
-2,	3
--2,	-3
--1,	-1
-"ABC",	"#VALUE!"
-TRUE,	1
-FALSE,	1
-0,	1
+,	1
+5.4,	7
+-5.4,	-7
+1.5,	3
+0.1,	1
+3,	3
+2,	3
+-2,	-3
+-1,	-1
+"ABC",	"#VALUE!"
+TRUE,	1
+FALSE,	1
+0,	1
diff --git a/unitTests/rawTestData/Calculation/MathTrig/POWER.data b/tests/rawTestData/Calculation/MathTrig/POWER.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/POWER.data
rename to tests/rawTestData/Calculation/MathTrig/POWER.data
index 46dca916..f00915e7 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/POWER.data
+++ b/tests/rawTestData/Calculation/MathTrig/POWER.data
@@ -1,81 +1,81 @@
--1.5,	-1.5,	"#NUM!"
--0.75,	-1.5,	"#NUM!"
-0,	-1.5,	"#DIV/0!"
-0.75,	-1.5,	1.539600717839
-1.5,	-1.5,	0.54433105395182
-2.25,	-1.5,	0.2962962962963
-3,	-1.5,	0.19245008972988
-3.75,	-1.5,	0.13770607453182
-4.5,	-1.5,	0.10475656017579
--1.5,	-0.75,	"#NUM!"
--0.75,	-0.75,	"#NUM!"
-0,	-0.75,	"#DIV/0!"
-0.75,	-0.75,	1.2408064788028
-1.5,	-0.75,	0.73778794646688
-2.25,	-0.75,	0.54433105395182
-3,	-0.75,	0.43869133765083
-3.75,	-0.75,	0.37108769116183
-4.5,	-0.75,	0.32366118113822
--1.5,	0,	1
--0.75,	0,	1
-0,	0,	"#NUM!"
-0.75,	0,	1
-1.5,	0,	1
-2.25,	0,	1
-3,	0,	1
-3.75,	0,	1
-4.5,	0,	1
--1.5,	0.75,	"#NUM!"
--0.75,	0.75,	"#NUM!"
-0,	0.75,	0
-0.75,	0.75,	0.80592744886766
-1.5,	0.75,	1.35540300541477
-2.25,	0.75,	1.83711730708738
-3,	0.75,	2.27950705695478
-3.75,	0.75,	2.69478083972313
-4.5,	0.75,	3.08965071586068
--1.5,	1.5,	"#NUM!"
--0.75,	1.5,	"#NUM!"
-0,	1.5,	0
-0.75,	1.5,	0.64951905283833
-1.5,	1.5,	1.83711730708738
-2.25,	1.5,	3.375
-3,	1.5,	5.19615242270663
-3.75,	1.5,	7.26184377413891
-4.5,	1.5,	9.54594154601839
--1.5,	2.25,	"#NUM!"
--0.75,	2.25,	"#NUM!"
-0,	2.25,	0
-0.75,	2.25,	0.52346523324493
-1.5,	2.25,	2.49003431932572
-2.25,	2.25,	6.20027091141992
-3,	2.25,	11.8446661165724
-3.75,	2.25,	19.5690774636122
-4.5,	2.25,	29.4936251312199
--1.5,	3,	-3.375
--0.75,	3,	-0.421875
-0,	3,	0
-0.75,	3,	0.421875
-1.5,	3,	3.375
-2.25,	3,	11.390625
-3,	3,	27
-3.75,	3,	52.734375
-4.5,	3,	91.125
--1.5,	3.75,	"#NUM!"
--0.75,	3.75,	"#NUM!"
-0,	3.75,	0
-0.75,	3.75,	0.34000064249104
-1.5,	3.75,	4.57448514327484
-2.25,	3.75,	20.9259143260422
-3,	3.75,	61.546690537779
-3.75,	3.75,	142.107583344775
-4.5,	3.75,	281.544421482804
--1.5,	4.5,	"#NUM!"
--0.75,	4.5,	"#NUM!"
-0,	4.5,	0
-0.75,	4.5,	0.27401585041617
-1.5,	4.5,	6.20027091141992
-2.25,	4.5,	38.443359375
-3,	4.5,	140.296115413079
-3.75,	4.5,	382.948792776857
-4.5,	4.5,	869.873923380926
+-1.5,	-1.5,	"#NUM!"
+-0.75,	-1.5,	"#NUM!"
+0,	-1.5,	"#DIV/0!"
+0.75,	-1.5,	1.539600717839
+1.5,	-1.5,	0.54433105395182
+2.25,	-1.5,	0.2962962962963
+3,	-1.5,	0.19245008972988
+3.75,	-1.5,	0.13770607453182
+4.5,	-1.5,	0.10475656017579
+-1.5,	-0.75,	"#NUM!"
+-0.75,	-0.75,	"#NUM!"
+0,	-0.75,	"#DIV/0!"
+0.75,	-0.75,	1.2408064788028
+1.5,	-0.75,	0.73778794646688
+2.25,	-0.75,	0.54433105395182
+3,	-0.75,	0.43869133765083
+3.75,	-0.75,	0.37108769116183
+4.5,	-0.75,	0.32366118113822
+-1.5,	0,	1
+-0.75,	0,	1
+0,	0,	"#NUM!"
+0.75,	0,	1
+1.5,	0,	1
+2.25,	0,	1
+3,	0,	1
+3.75,	0,	1
+4.5,	0,	1
+-1.5,	0.75,	"#NUM!"
+-0.75,	0.75,	"#NUM!"
+0,	0.75,	0
+0.75,	0.75,	0.80592744886766
+1.5,	0.75,	1.35540300541477
+2.25,	0.75,	1.83711730708738
+3,	0.75,	2.27950705695478
+3.75,	0.75,	2.69478083972313
+4.5,	0.75,	3.08965071586068
+-1.5,	1.5,	"#NUM!"
+-0.75,	1.5,	"#NUM!"
+0,	1.5,	0
+0.75,	1.5,	0.64951905283833
+1.5,	1.5,	1.83711730708738
+2.25,	1.5,	3.375
+3,	1.5,	5.19615242270663
+3.75,	1.5,	7.26184377413891
+4.5,	1.5,	9.54594154601839
+-1.5,	2.25,	"#NUM!"
+-0.75,	2.25,	"#NUM!"
+0,	2.25,	0
+0.75,	2.25,	0.52346523324493
+1.5,	2.25,	2.49003431932572
+2.25,	2.25,	6.20027091141992
+3,	2.25,	11.8446661165724
+3.75,	2.25,	19.5690774636122
+4.5,	2.25,	29.4936251312199
+-1.5,	3,	-3.375
+-0.75,	3,	-0.421875
+0,	3,	0
+0.75,	3,	0.421875
+1.5,	3,	3.375
+2.25,	3,	11.390625
+3,	3,	27
+3.75,	3,	52.734375
+4.5,	3,	91.125
+-1.5,	3.75,	"#NUM!"
+-0.75,	3.75,	"#NUM!"
+0,	3.75,	0
+0.75,	3.75,	0.34000064249104
+1.5,	3.75,	4.57448514327484
+2.25,	3.75,	20.9259143260422
+3,	3.75,	61.546690537779
+3.75,	3.75,	142.107583344775
+4.5,	3.75,	281.544421482804
+-1.5,	4.5,	"#NUM!"
+-0.75,	4.5,	"#NUM!"
+0,	4.5,	0
+0.75,	4.5,	0.27401585041617
+1.5,	4.5,	6.20027091141992
+2.25,	4.5,	38.443359375
+3,	4.5,	140.296115413079
+3.75,	4.5,	382.948792776857
+4.5,	4.5,	869.873923380926
diff --git a/unitTests/rawTestData/Calculation/MathTrig/PRODUCT.data b/tests/rawTestData/Calculation/MathTrig/PRODUCT.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/PRODUCT.data
rename to tests/rawTestData/Calculation/MathTrig/PRODUCT.data
index dc203a02..9ff8b20c 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/PRODUCT.data
+++ b/tests/rawTestData/Calculation/MathTrig/PRODUCT.data
@@ -1,7 +1,7 @@
-5,	15,	30,			2250
-5,	15,	30,	2,		4500
-3,	6,	2,	8,	5,	1440
-3,	4,				12
-3,	4,	4.5,			54
-3,	4,	4.5,	-6.78,		-366.12
-3,	4,	4.5,	-6.78,	-2,	732.24
+5,	15,	30,			2250
+5,	15,	30,	2,		4500
+3,	6,	2,	8,	5,	1440
+3,	4,				12
+3,	4,	4.5,			54
+3,	4,	4.5,	-6.78,		-366.12
+3,	4,	4.5,	-6.78,	-2,	732.24
diff --git a/unitTests/rawTestData/Calculation/MathTrig/QUOTIENT.data b/tests/rawTestData/Calculation/MathTrig/QUOTIENT.data
similarity index 91%
rename from unitTests/rawTestData/Calculation/MathTrig/QUOTIENT.data
rename to tests/rawTestData/Calculation/MathTrig/QUOTIENT.data
index 61c6b7b3..06619aae 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/QUOTIENT.data
+++ b/tests/rawTestData/Calculation/MathTrig/QUOTIENT.data
@@ -1,6 +1,6 @@
-5,	2,	2
-4.5,	3.1,	1
--10,	3,	-3
-10,	2.2,	4
-5.5,	2.667,	2
--7,	2,	-3
+5,	2,	2
+4.5,	3.1,	1
+-10,	3,	-3
+10,	2.2,	4
+5.5,	2.667,	2
+-7,	2,	-3
diff --git a/unitTests/rawTestData/Calculation/MathTrig/ROMAN.data b/tests/rawTestData/Calculation/MathTrig/ROMAN.data
similarity index 92%
rename from unitTests/rawTestData/Calculation/MathTrig/ROMAN.data
rename to tests/rawTestData/Calculation/MathTrig/ROMAN.data
index 3ab436ad..69085897 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/ROMAN.data
+++ b/tests/rawTestData/Calculation/MathTrig/ROMAN.data
@@ -1,5 +1,5 @@
-49,	"XLIX"
-50,	"L"
-2012,	"MMXII"
-999,	"CMXCIX"
-499,	"CDXCIX"
+49,	"XLIX"
+50,	"L"
+2012,	"MMXII"
+999,	"CMXCIX"
+499,	"CDXCIX"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data b/tests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data
rename to tests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data
index 54301439..7bb42c0c 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data
+++ b/tests/rawTestData/Calculation/MathTrig/ROUNDDOWN.data
@@ -1,14 +1,14 @@
-662.79,		0,	662
-662.79,		1,	662.7
-54.1,		-1,	50
-55.1,		-1,	50
--23.67,		1,	-23.6
-3.2,		0,	3
-3.2,		0.01,	3
-76.9,		0,	76
-3.14159,	3,	3.141
--3.14159,	1,	-3.1
-31415.92654,	-2,	31400
-31415.92654,	-1,	31410
-"ABC",		1,	"#VALUE!"
-1.234,		"ABC",	"#VALUE!"
+662.79,		0,	662
+662.79,		1,	662.7
+54.1,		-1,	50
+55.1,		-1,	50
+-23.67,		1,	-23.6
+3.2,		0,	3
+3.2,		0.01,	3
+76.9,		0,	76
+3.14159,	3,	3.141
+-3.14159,	1,	-3.1
+31415.92654,	-2,	31400
+31415.92654,	-1,	31410
+"ABC",		1,	"#VALUE!"
+1.234,		"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/ROUNDUP.data b/tests/rawTestData/Calculation/MathTrig/ROUNDUP.data
similarity index 94%
rename from unitTests/rawTestData/Calculation/MathTrig/ROUNDUP.data
rename to tests/rawTestData/Calculation/MathTrig/ROUNDUP.data
index 69f2bcdb..ba81e3db 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/ROUNDUP.data
+++ b/tests/rawTestData/Calculation/MathTrig/ROUNDUP.data
@@ -1,14 +1,14 @@
-662.79,		0,	663
-662.79,		1,	662.8
-54.1,		-1,	60
-55.1,		-1,	60
--23.62,		1,	-23.7
-3.2,		0,	4
-3.2,		0.01,	4
-76.9,		0,	77
-3.14159,	3,	3.142
--3.14159,	1,	-3.2
-31415.92654,	-2,	31500
-31415.92654,	-1,	31420
-"ABC",		1,	"#VALUE!"
-1.234,		"ABC",	"#VALUE!"
+662.79,		0,	663
+662.79,		1,	662.8
+54.1,		-1,	60
+55.1,		-1,	60
+-23.62,		1,	-23.7
+3.2,		0,	4
+3.2,		0.01,	4
+76.9,		0,	77
+3.14159,	3,	3.142
+-3.14159,	1,	-3.2
+31415.92654,	-2,	31500
+31415.92654,	-1,	31420
+"ABC",		1,	"#VALUE!"
+1.234,		"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/MathTrig/SERIESSUM.data b/tests/rawTestData/Calculation/MathTrig/SERIESSUM.data
similarity index 96%
rename from unitTests/rawTestData/Calculation/MathTrig/SERIESSUM.data
rename to tests/rawTestData/Calculation/MathTrig/SERIESSUM.data
index 9b9f386b..eb47f684 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/SERIESSUM.data
+++ b/tests/rawTestData/Calculation/MathTrig/SERIESSUM.data
@@ -1,2 +1,2 @@
-5,	1,	1,	{1|1|1|1|1},	3905
-2,	1,	2,	{1|2|3|4|5},	3186
+5,	1,	1,	{1|1|1|1|1},	3905
+2,	1,	2,	{1|2|3|4|5},	3186
diff --git a/unitTests/rawTestData/Calculation/MathTrig/SIGN.data b/tests/rawTestData/Calculation/MathTrig/SIGN.data
similarity index 89%
rename from unitTests/rawTestData/Calculation/MathTrig/SIGN.data
rename to tests/rawTestData/Calculation/MathTrig/SIGN.data
index a22a1e30..8494da9e 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/SIGN.data
+++ b/tests/rawTestData/Calculation/MathTrig/SIGN.data
@@ -1,13 +1,13 @@
--1.5,	-1
--1,	-1
--0.5,	-1
-0,	0
-0.5,	1
-1,	1
-1.5,	1
-2,	1
-2.5,	1
-"ABC",	"#VALUE!"
-TRUE,	1
-FALSE,	0
-"-3.5",	-1
+-1.5,	-1
+-1,	-1
+-0.5,	-1
+0,	0
+0.5,	1
+1,	1
+1.5,	1
+2,	1
+2.5,	1
+"ABC",	"#VALUE!"
+TRUE,	1
+FALSE,	0
+"-3.5",	-1
diff --git a/unitTests/rawTestData/Calculation/MathTrig/SQRTPI.data b/tests/rawTestData/Calculation/MathTrig/SQRTPI.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/SQRTPI.data
rename to tests/rawTestData/Calculation/MathTrig/SQRTPI.data
index 002519f7..fc1ea525 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/SQRTPI.data
+++ b/tests/rawTestData/Calculation/MathTrig/SQRTPI.data
@@ -1,15 +1,15 @@
-"ABC",	"#VALUE!"
--1.5,	"#NUM!"
--1,	"#NUM!"
--0.5,	"#NUM!"
-0,	0.000000000000000000
-0.5,	1.253314137315500000
-1,	1.772453850905520000
-1.5,	2.170803763674800000
-2,	2.506628274631000000
-2.5,	2.802495608198960000
-3,	3.069980123839470000
-3.5,	3.315957521978270000
-4,	3.544907701811030000
-4.5,	3.759942411946500000
-5,	3.963327297606010000
+"ABC",	"#VALUE!"
+-1.5,	"#NUM!"
+-1,	"#NUM!"
+-0.5,	"#NUM!"
+0,	0.000000000000000000
+0.5,	1.253314137315500000
+1,	1.772453850905520000
+1.5,	2.170803763674800000
+2,	2.506628274631000000
+2.5,	2.802495608198960000
+3,	3.069980123839470000
+3.5,	3.315957521978270000
+4,	3.544907701811030000
+4.5,	3.759942411946500000
+5,	3.963327297606010000
diff --git a/unitTests/rawTestData/Calculation/MathTrig/SUMSQ.data b/tests/rawTestData/Calculation/MathTrig/SUMSQ.data
similarity index 93%
rename from unitTests/rawTestData/Calculation/MathTrig/SUMSQ.data
rename to tests/rawTestData/Calculation/MathTrig/SUMSQ.data
index c57ab9c1..557c5c05 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/SUMSQ.data
+++ b/tests/rawTestData/Calculation/MathTrig/SUMSQ.data
@@ -1,7 +1,7 @@
-3,	4,			25
-5,	2,	1,	3,	39
-5,	2,	1,	6,	66
-1,	3,			10
-1,	3,	2,	4,	30
-3,	5,	7,		83
-1,	2,	3,		14
+3,	4,			25
+5,	2,	1,	3,	39
+5,	2,	1,	6,	66
+1,	3,			10
+1,	3,	2,	4,	30
+3,	5,	7,		83
+1,	2,	3,		14
diff --git a/unitTests/rawTestData/Calculation/MathTrig/TRUNC.data b/tests/rawTestData/Calculation/MathTrig/TRUNC.data
similarity index 95%
rename from unitTests/rawTestData/Calculation/MathTrig/TRUNC.data
rename to tests/rawTestData/Calculation/MathTrig/TRUNC.data
index 7c7548d1..8c85bddc 100644
--- a/unitTests/rawTestData/Calculation/MathTrig/TRUNC.data
+++ b/tests/rawTestData/Calculation/MathTrig/TRUNC.data
@@ -1,19 +1,19 @@
-3.14159,	2,	3.14
-3.14159,	3,	3.141
--3.14159,	2,	-3.14
--3.14159,	3,	-3.141
-31415.92654,	10,	31415.92654
--31415.92654,	10,	-31415.92654
-31415.92654,	2,	31415.92
-31415.92654,	-2,	31400
-31415.92654,	-10,	0
--31415.92654,	-10,	0
-12345.6789,	-3,	12000
-12345.6789,	-2,	12300
-12345.6789,	-1,	12340
-12345.6789,	0,	12345
-12345.6789,	1,	12345.6
-12345.6789,	2,	12345.67
-12345.6789,	3,	12345.678
-"ABC",		2,	"#VALUE!"
-31415.92654,	"ABC",	"#VALUE!"
+3.14159,	2,	3.14
+3.14159,	3,	3.141
+-3.14159,	2,	-3.14
+-3.14159,	3,	-3.141
+31415.92654,	10,	31415.92654
+-31415.92654,	10,	-31415.92654
+31415.92654,	2,	31415.92
+31415.92654,	-2,	31400
+31415.92654,	-10,	0
+-31415.92654,	-10,	0
+12345.6789,	-3,	12000
+12345.6789,	-2,	12300
+12345.6789,	-1,	12340
+12345.6789,	0,	12345
+12345.6789,	1,	12345.6
+12345.6789,	2,	12345.67
+12345.6789,	3,	12345.678
+"ABC",		2,	"#VALUE!"
+31415.92654,	"ABC",	"#VALUE!"
diff --git a/unitTests/rawTestData/Calculation/TextData/CHAR.data b/tests/rawTestData/Calculation/TextData/CHAR.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/CHAR.data
rename to tests/rawTestData/Calculation/TextData/CHAR.data
diff --git a/unitTests/rawTestData/Calculation/TextData/CLEAN.data b/tests/rawTestData/Calculation/TextData/CLEAN.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/CLEAN.data
rename to tests/rawTestData/Calculation/TextData/CLEAN.data
diff --git a/unitTests/rawTestData/Calculation/TextData/CODE.data b/tests/rawTestData/Calculation/TextData/CODE.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/CODE.data
rename to tests/rawTestData/Calculation/TextData/CODE.data
diff --git a/unitTests/rawTestData/Calculation/TextData/CONCATENATE.data b/tests/rawTestData/Calculation/TextData/CONCATENATE.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/CONCATENATE.data
rename to tests/rawTestData/Calculation/TextData/CONCATENATE.data
diff --git a/unitTests/rawTestData/Calculation/TextData/DOLLAR.data b/tests/rawTestData/Calculation/TextData/DOLLAR.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/DOLLAR.data
rename to tests/rawTestData/Calculation/TextData/DOLLAR.data
diff --git a/unitTests/rawTestData/Calculation/TextData/FIND.data b/tests/rawTestData/Calculation/TextData/FIND.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/FIND.data
rename to tests/rawTestData/Calculation/TextData/FIND.data
diff --git a/unitTests/rawTestData/Calculation/TextData/FIXED.data b/tests/rawTestData/Calculation/TextData/FIXED.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/FIXED.data
rename to tests/rawTestData/Calculation/TextData/FIXED.data
diff --git a/unitTests/rawTestData/Calculation/TextData/LEFT.data b/tests/rawTestData/Calculation/TextData/LEFT.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/LEFT.data
rename to tests/rawTestData/Calculation/TextData/LEFT.data
diff --git a/unitTests/rawTestData/Calculation/TextData/LEN.data b/tests/rawTestData/Calculation/TextData/LEN.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/LEN.data
rename to tests/rawTestData/Calculation/TextData/LEN.data
diff --git a/unitTests/rawTestData/Calculation/TextData/LOWER.data b/tests/rawTestData/Calculation/TextData/LOWER.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/LOWER.data
rename to tests/rawTestData/Calculation/TextData/LOWER.data
diff --git a/unitTests/rawTestData/Calculation/TextData/MID.data b/tests/rawTestData/Calculation/TextData/MID.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/MID.data
rename to tests/rawTestData/Calculation/TextData/MID.data
diff --git a/unitTests/rawTestData/Calculation/TextData/PROPER.data b/tests/rawTestData/Calculation/TextData/PROPER.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/PROPER.data
rename to tests/rawTestData/Calculation/TextData/PROPER.data
diff --git a/unitTests/rawTestData/Calculation/TextData/REPLACE.data b/tests/rawTestData/Calculation/TextData/REPLACE.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/REPLACE.data
rename to tests/rawTestData/Calculation/TextData/REPLACE.data
diff --git a/unitTests/rawTestData/Calculation/TextData/RIGHT.data b/tests/rawTestData/Calculation/TextData/RIGHT.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/RIGHT.data
rename to tests/rawTestData/Calculation/TextData/RIGHT.data
diff --git a/unitTests/rawTestData/Calculation/TextData/SEARCH.data b/tests/rawTestData/Calculation/TextData/SEARCH.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/SEARCH.data
rename to tests/rawTestData/Calculation/TextData/SEARCH.data
diff --git a/unitTests/rawTestData/Calculation/TextData/SUBSTITUTE.data b/tests/rawTestData/Calculation/TextData/SUBSTITUTE.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/SUBSTITUTE.data
rename to tests/rawTestData/Calculation/TextData/SUBSTITUTE.data
diff --git a/unitTests/rawTestData/Calculation/TextData/T.data b/tests/rawTestData/Calculation/TextData/T.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/T.data
rename to tests/rawTestData/Calculation/TextData/T.data
diff --git a/unitTests/rawTestData/Calculation/TextData/TEXT.data b/tests/rawTestData/Calculation/TextData/TEXT.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/TEXT.data
rename to tests/rawTestData/Calculation/TextData/TEXT.data
diff --git a/unitTests/rawTestData/Calculation/TextData/TRIM.data b/tests/rawTestData/Calculation/TextData/TRIM.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/TRIM.data
rename to tests/rawTestData/Calculation/TextData/TRIM.data
diff --git a/unitTests/rawTestData/Calculation/TextData/UPPER.data b/tests/rawTestData/Calculation/TextData/UPPER.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/UPPER.data
rename to tests/rawTestData/Calculation/TextData/UPPER.data
diff --git a/unitTests/rawTestData/Calculation/TextData/VALUE.data b/tests/rawTestData/Calculation/TextData/VALUE.data
similarity index 100%
rename from unitTests/rawTestData/Calculation/TextData/VALUE.data
rename to tests/rawTestData/Calculation/TextData/VALUE.data
diff --git a/unitTests/rawTestData/CalculationBinaryComparisonOperation.data b/tests/rawTestData/CalculationBinaryComparisonOperation.data
similarity index 100%
rename from unitTests/rawTestData/CalculationBinaryComparisonOperation.data
rename to tests/rawTestData/CalculationBinaryComparisonOperation.data
diff --git a/unitTests/rawTestData/Cell/DefaultValueBinder.json b/tests/rawTestData/Cell/DefaultValueBinder.json
similarity index 100%
rename from unitTests/rawTestData/Cell/DefaultValueBinder.json
rename to tests/rawTestData/Cell/DefaultValueBinder.json
diff --git a/unitTests/rawTestData/CellAbsoluteCoordinate.data b/tests/rawTestData/CellAbsoluteCoordinate.data
similarity index 100%
rename from unitTests/rawTestData/CellAbsoluteCoordinate.data
rename to tests/rawTestData/CellAbsoluteCoordinate.data
diff --git a/unitTests/rawTestData/CellAbsoluteReference.data b/tests/rawTestData/CellAbsoluteReference.data
similarity index 100%
rename from unitTests/rawTestData/CellAbsoluteReference.data
rename to tests/rawTestData/CellAbsoluteReference.data
diff --git a/unitTests/rawTestData/CellBuildRange.data b/tests/rawTestData/CellBuildRange.data
similarity index 100%
rename from unitTests/rawTestData/CellBuildRange.data
rename to tests/rawTestData/CellBuildRange.data
diff --git a/unitTests/rawTestData/CellCoordinates.data b/tests/rawTestData/CellCoordinates.data
similarity index 100%
rename from unitTests/rawTestData/CellCoordinates.data
rename to tests/rawTestData/CellCoordinates.data
diff --git a/unitTests/rawTestData/CellExtractAllCellReferencesInRange.data b/tests/rawTestData/CellExtractAllCellReferencesInRange.data
similarity index 100%
rename from unitTests/rawTestData/CellExtractAllCellReferencesInRange.data
rename to tests/rawTestData/CellExtractAllCellReferencesInRange.data
diff --git a/unitTests/rawTestData/CellGetRangeBoundaries.data b/tests/rawTestData/CellGetRangeBoundaries.data
similarity index 100%
rename from unitTests/rawTestData/CellGetRangeBoundaries.data
rename to tests/rawTestData/CellGetRangeBoundaries.data
diff --git a/unitTests/rawTestData/CellRangeBoundaries.data b/tests/rawTestData/CellRangeBoundaries.data
similarity index 100%
rename from unitTests/rawTestData/CellRangeBoundaries.data
rename to tests/rawTestData/CellRangeBoundaries.data
diff --git a/unitTests/rawTestData/CellRangeDimension.data b/tests/rawTestData/CellRangeDimension.data
similarity index 100%
rename from unitTests/rawTestData/CellRangeDimension.data
rename to tests/rawTestData/CellRangeDimension.data
diff --git a/unitTests/rawTestData/CellSplitRange.data b/tests/rawTestData/CellSplitRange.data
similarity index 100%
rename from unitTests/rawTestData/CellSplitRange.data
rename to tests/rawTestData/CellSplitRange.data
diff --git a/unitTests/rawTestData/ColumnIndex.data b/tests/rawTestData/ColumnIndex.data
similarity index 100%
rename from unitTests/rawTestData/ColumnIndex.data
rename to tests/rawTestData/ColumnIndex.data
diff --git a/unitTests/rawTestData/ColumnString.data b/tests/rawTestData/ColumnString.data
similarity index 100%
rename from unitTests/rawTestData/ColumnString.data
rename to tests/rawTestData/ColumnString.data
diff --git a/unitTests/rawTestData/Reader/XEETestInvalidUTF-16.xml b/tests/rawTestData/Reader/XEETestInvalidUTF-16.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestInvalidUTF-16.xml
rename to tests/rawTestData/Reader/XEETestInvalidUTF-16.xml
diff --git a/unitTests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml b/tests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml
rename to tests/rawTestData/Reader/XEETestInvalidUTF-16BE.xml
diff --git a/unitTests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml b/tests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml
rename to tests/rawTestData/Reader/XEETestInvalidUTF-16LE.xml
diff --git a/unitTests/rawTestData/Reader/XEETestInvalidUTF-8.xml b/tests/rawTestData/Reader/XEETestInvalidUTF-8.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestInvalidUTF-8.xml
rename to tests/rawTestData/Reader/XEETestInvalidUTF-8.xml
diff --git a/unitTests/rawTestData/Reader/XEETestValidUTF-16.xml b/tests/rawTestData/Reader/XEETestValidUTF-16.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestValidUTF-16.xml
rename to tests/rawTestData/Reader/XEETestValidUTF-16.xml
diff --git a/unitTests/rawTestData/Reader/XEETestValidUTF-16BE.xml b/tests/rawTestData/Reader/XEETestValidUTF-16BE.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestValidUTF-16BE.xml
rename to tests/rawTestData/Reader/XEETestValidUTF-16BE.xml
diff --git a/unitTests/rawTestData/Reader/XEETestValidUTF-16LE.xml b/tests/rawTestData/Reader/XEETestValidUTF-16LE.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestValidUTF-16LE.xml
rename to tests/rawTestData/Reader/XEETestValidUTF-16LE.xml
diff --git a/unitTests/rawTestData/Reader/XEETestValidUTF-8.xml b/tests/rawTestData/Reader/XEETestValidUTF-8.xml
similarity index 100%
rename from unitTests/rawTestData/Reader/XEETestValidUTF-8.xml
rename to tests/rawTestData/Reader/XEETestValidUTF-8.xml
diff --git a/unitTests/rawTestData/Shared/CentimeterSizeToPixels.data b/tests/rawTestData/Shared/CentimeterSizeToPixels.data
similarity index 100%
rename from unitTests/rawTestData/Shared/CentimeterSizeToPixels.data
rename to tests/rawTestData/Shared/CentimeterSizeToPixels.data
diff --git a/unitTests/rawTestData/Shared/CodePage.data b/tests/rawTestData/Shared/CodePage.data
similarity index 100%
rename from unitTests/rawTestData/Shared/CodePage.data
rename to tests/rawTestData/Shared/CodePage.data
diff --git a/unitTests/rawTestData/Shared/DateTimeExcelToPHP1900.data b/tests/rawTestData/Shared/DateTimeExcelToPHP1900.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimeExcelToPHP1900.data
rename to tests/rawTestData/Shared/DateTimeExcelToPHP1900.data
diff --git a/unitTests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data b/tests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data
rename to tests/rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data
diff --git a/unitTests/rawTestData/Shared/DateTimeExcelToPHP1904.data b/tests/rawTestData/Shared/DateTimeExcelToPHP1904.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimeExcelToPHP1904.data
rename to tests/rawTestData/Shared/DateTimeExcelToPHP1904.data
diff --git a/unitTests/rawTestData/Shared/DateTimeFormatCodes.data b/tests/rawTestData/Shared/DateTimeFormatCodes.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimeFormatCodes.data
rename to tests/rawTestData/Shared/DateTimeFormatCodes.data
diff --git a/unitTests/rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data b/tests/rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data
rename to tests/rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data
diff --git a/unitTests/rawTestData/Shared/DateTimePHPToExcel1900.data b/tests/rawTestData/Shared/DateTimePHPToExcel1900.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimePHPToExcel1900.data
rename to tests/rawTestData/Shared/DateTimePHPToExcel1900.data
diff --git a/unitTests/rawTestData/Shared/DateTimePHPToExcel1904.data b/tests/rawTestData/Shared/DateTimePHPToExcel1904.data
similarity index 100%
rename from unitTests/rawTestData/Shared/DateTimePHPToExcel1904.data
rename to tests/rawTestData/Shared/DateTimePHPToExcel1904.data
diff --git a/unitTests/rawTestData/Shared/FontSizeToPixels.data b/tests/rawTestData/Shared/FontSizeToPixels.data
similarity index 100%
rename from unitTests/rawTestData/Shared/FontSizeToPixels.data
rename to tests/rawTestData/Shared/FontSizeToPixels.data
diff --git a/unitTests/rawTestData/Shared/InchSizeToPixels.data b/tests/rawTestData/Shared/InchSizeToPixels.data
similarity index 100%
rename from unitTests/rawTestData/Shared/InchSizeToPixels.data
rename to tests/rawTestData/Shared/InchSizeToPixels.data
diff --git a/unitTests/rawTestData/Shared/PasswordHashes.data b/tests/rawTestData/Shared/PasswordHashes.data
similarity index 100%
rename from unitTests/rawTestData/Shared/PasswordHashes.data
rename to tests/rawTestData/Shared/PasswordHashes.data
diff --git a/unitTests/rawTestData/Style/ColorChangeBrightness.json b/tests/rawTestData/Style/ColorChangeBrightness.json
similarity index 100%
rename from unitTests/rawTestData/Style/ColorChangeBrightness.json
rename to tests/rawTestData/Style/ColorChangeBrightness.json
diff --git a/unitTests/rawTestData/Style/ColorGetBlue.data b/tests/rawTestData/Style/ColorGetBlue.data
similarity index 100%
rename from unitTests/rawTestData/Style/ColorGetBlue.data
rename to tests/rawTestData/Style/ColorGetBlue.data
diff --git a/unitTests/rawTestData/Style/ColorGetGreen.data b/tests/rawTestData/Style/ColorGetGreen.data
similarity index 100%
rename from unitTests/rawTestData/Style/ColorGetGreen.data
rename to tests/rawTestData/Style/ColorGetGreen.data
diff --git a/unitTests/rawTestData/Style/ColorGetRed.data b/tests/rawTestData/Style/ColorGetRed.data
similarity index 100%
rename from unitTests/rawTestData/Style/ColorGetRed.data
rename to tests/rawTestData/Style/ColorGetRed.data
diff --git a/unitTests/rawTestData/Style/NumberFormat.data b/tests/rawTestData/Style/NumberFormat.data
similarity index 100%
rename from unitTests/rawTestData/Style/NumberFormat.data
rename to tests/rawTestData/Style/NumberFormat.data
diff --git a/unitTests/rawTestData/Style/NumberFormatDates.data b/tests/rawTestData/Style/NumberFormatDates.data
similarity index 100%
rename from unitTests/rawTestData/Style/NumberFormatDates.data
rename to tests/rawTestData/Style/NumberFormatDates.data
diff --git a/unitTests/phpunit-cc.xml b/unitTests/phpunit-cc.xml
deleted file mode 100644
index 0c0ff340..00000000
--- a/unitTests/phpunit-cc.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<phpunit bootstrap="./bootstrap.php"
-    backupGlobals="true"
-    colors="true" 
-    convertErrorsToExceptions="true" 
-    convertNoticesToExceptions="true" 
-    convertWarningsToExceptions="true" 
-    processIsolation="false" 
-    syntaxCheck="true" 
-    verbose="true"
-    reportUselessTests="true"
-    strictCoverage="true"
-    disallowTestOutput="true"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false">
-    <php>
-        <ini name="memory_limit" value="2048M"/>
-    </php>
-    <testsuite name="PHPExcel Unit Test Suite">
-        <directory suffix="Test.php">./Classes</directory>
-    </testsuite>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../src</directory>
-            <exclude>
-                <directory>../src/PhpSpreadsheet/Shared/PCLZip</directory>
-                <directory>../src/PhpSpreadsheet/Shared/JAMA</directory>
-                <directory>../src/PhpSpreadsheet/Writer/PDF</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="./codeCoverage" charset="UTF-8"
-             yui="true" highlight="false"
-             lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="./codeCoverage/codeCoverage.xml"/>
-        <log type="metrics-xml" target="./metrics/metrics.xml"/>
-        <log type="test-xml" target="./testResults/logfile.xml" logIncompleteSkipped="false"/>
-    </logging>
-</phpunit> 
diff --git a/unitTests/phpunit.xml b/unitTests/phpunit.xml
deleted file mode 100644
index 95ca0774..00000000
--- a/unitTests/phpunit.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<phpunit bootstrap="./bootstrap.php"
-    backupGlobals="true"
-    colors="true" 
-    convertErrorsToExceptions="true" 
-    convertNoticesToExceptions="true" 
-    convertWarningsToExceptions="true" 
-    processIsolation="false" 
-    syntaxCheck="true" 
-    verbose="true"
-    reportUselessTests="true"
-    strictCoverage="true"
-    disallowTestOutput="true"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false">
-    <php>
-        <ini name="memory_limit" value="2048M"/>
-    </php>
-    <testsuite name="PHPExcel Unit Test Suite">
-        <directory suffix="Test.php">./Classes</directory>
-    </testsuite>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../src</directory>
-            <exclude>
-                <directory>../src/PhpSpreadsheet/Shared/PCLZip</directory>
-                <directory>../src/PhpSpreadsheet/Shared/JAMA</directory>
-                <directory>../src/PhpSpreadsheet/Writer/PDF</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>