diff --git a/unitTests/PHPExcel/Calculation/EngineeringTest.php b/unitTests/PHPExcel/Calculation/EngineeringTest.php
new file mode 100644
index 00000000..5e33769a
--- /dev/null
+++ b/unitTests/PHPExcel/Calculation/EngineeringTest.php
@@ -0,0 +1,696 @@
+<?php
+
+//  Custom assertion class for handling precision of Complex numbers
+require_once __DIR__.'/../../custom/complexAssert.php';
+
+//  Data Provider handler
+require_once 'testDataFileIterator.php';
+
+
+class EngineeringTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        if (!defined('PHPEXCEL_ROOT'))
+        {
+            define('PHPEXCEL_ROOT', APPLICATION_PATH . '/');
+        }
+        require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	}
+
+    /**
+     * @dataProvider providerBESSELI
+     */
+	public function testBESSELI()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BESSELI'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerBESSELI()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
+	}
+
+    /**
+     * @dataProvider providerBESSELJ
+     */
+	public function testBESSELJ()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BESSELJ'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerBESSELJ()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
+	}
+
+    /**
+     * @dataProvider providerBESSELK
+     */
+	public function testBESSELK()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BESSELK'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerBESSELK()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
+	}
+
+    /**
+     * @dataProvider providerBESSELY
+     */
+	public function testBESSELY()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BESSELY'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerBESSELY()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
+	}
+
+    /**
+     * @dataProvider providerCOMPLEX
+     */
+	public function testCOMPLEX()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','COMPLEX'),$args);
+		$this->assertEquals($expectedResult, $result);
+	}
+
+    public function providerCOMPLEX()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
+	}
+
+    /**
+     * @dataProvider providerIMAGINARY
+     */
+	public function testIMAGINARY()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMAGINARY'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerIMAGINARY()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
+	}
+
+    /**
+     * @dataProvider providerIMREAL
+     */
+	public function testIMREAL()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMREAL'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerIMREAL()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
+	}
+
+    /**
+     * @dataProvider providerIMABS
+     */
+	public function testIMABS()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMABS'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerIMABS()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
+	}
+
+    /**
+     * @dataProvider providerIMARGUMENT
+     */
+	public function testIMARGUMENT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMARGUMENT'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-8);
+	}
+
+    public function providerIMARGUMENT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
+	}
+
+    /**
+     * @dataProvider providerIMCONJUGATE
+     */
+	public function testIMCONJUGATE()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMCONJUGATE'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMCONJUGATE()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
+	}
+
+    /**
+     * @dataProvider providerIMCOS
+     */
+	public function testIMCOS()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMCOS'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMCOS()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
+	}
+
+    /**
+     * @dataProvider providerIMDIV
+     */
+	public function testIMDIV()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMDIV'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMDIV()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
+	}
+
+    /**
+     * @dataProvider providerIMEXP
+     */
+	public function testIMEXP()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMEXP'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMEXP()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
+	}
+
+    /**
+     * @dataProvider providerIMLN
+     */
+	public function testIMLN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMLN'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMLN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
+	}
+
+    /**
+     * @dataProvider providerIMLOG2
+     */
+	public function testIMLOG2()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMLOG2'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMLOG2()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
+	}
+
+    /**
+     * @dataProvider providerIMLOG10
+     */
+	public function testIMLOG10()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMLOG10'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMLOG10()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
+	}
+
+    /**
+     * @dataProvider providerIMPOWER
+     */
+	public function testIMPOWER()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMPOWER'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMPOWER()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
+	}
+
+    /**
+     * @dataProvider providerIMPRODUCT
+     */
+	public function testIMPRODUCT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMPRODUCT'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMPRODUCT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
+	}
+
+    /**
+     * @dataProvider providerIMSIN
+     */
+	public function testIMSIN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMSIN'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMSIN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
+	}
+
+    /**
+     * @dataProvider providerIMSQRT
+     */
+	public function testIMSQRT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMSQRT'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMSQRT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
+	}
+
+    /**
+     * @dataProvider providerIMSUB
+     */
+	public function testIMSUB()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMSUB'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMSUB()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
+	}
+
+    /**
+     * @dataProvider providerIMSUM
+     */
+	public function testIMSUM()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','IMSUM'),$args);
+		$complexAssert = new complexAssert();
+		$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8),
+						  $complexAssert->getErrorMessage());
+	}
+
+    public function providerIMSUM()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
+	}
+
+    /**
+     * @dataProvider providerERF
+     */
+	public function testERF()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','ERF'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-6);
+	}
+
+    public function providerERF()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
+	}
+
+    /**
+     * @dataProvider providerERFC
+     */
+	public function testERFC()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','ERFC'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-6);
+	}
+
+    public function providerERFC()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
+	}
+
+    /**
+     * @dataProvider providerBIN2DEC
+     */
+	public function testBIN2DEC()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BINTODEC'),$args);
+		$this->assertEquals($expectedResult, $result);
+	}
+
+    public function providerBIN2DEC()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
+	}
+
+    /**
+     * @dataProvider providerBIN2HEX
+     */
+	public function testBIN2HEX()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BINTOHEX'),$args);
+		$this->assertEquals($expectedResult, $result);
+	}
+
+    public function providerBIN2HEX()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
+	}
+
+    /**
+     * @dataProvider providerBIN2OCT
+     */
+	public function testBIN2OCT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','BINTOOCT'),$args);
+		$this->assertEquals($expectedResult, $result);
+	}
+
+    public function providerBIN2OCT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
+	}
+
+    /**
+     * @dataProvider providerDEC2BIN
+     */
+	public function testDEC2BIN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','DECTOBIN'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerDEC2BIN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
+	}
+
+    /**
+     * @dataProvider providerDEC2HEX
+     */
+	public function testDEC2HEX()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','DECTOHEX'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerDEC2HEX()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
+	}
+
+    /**
+     * @dataProvider providerDEC2OCT
+     */
+	public function testDEC2OCT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','DECTOOCT'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerDEC2OCT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
+	}
+
+    /**
+     * @dataProvider providerHEX2BIN
+     */
+	public function testHEX2BIN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','HEXTOBIN'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerHEX2BIN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
+	}
+
+    /**
+     * @dataProvider providerHEX2DEC
+     */
+	public function testHEX2DEC()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','HEXTODEC'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerHEX2DEC()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
+	}
+
+    /**
+     * @dataProvider providerHEX2OCT
+     */
+	public function testHEX2OCT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','HEXTOOCT'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerHEX2OCT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
+	}
+
+    /**
+     * @dataProvider providerOCT2BIN
+     */
+	public function testOCT2BIN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','OCTTOBIN'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerOCT2BIN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
+	}
+
+    /**
+     * @dataProvider providerOCT2DEC
+     */
+	public function testOCT2DEC()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','OCTTODEC'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerOCT2DEC()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
+	}
+
+    /**
+     * @dataProvider providerOCT2HEX
+     */
+	public function testOCT2HEX()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','OCTTOHEX'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerOCT2HEX()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
+	}
+
+    /**
+     * @dataProvider providerDELTA
+     */
+	public function testDELTA()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','DELTA'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerDELTA()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
+	}
+
+    /**
+     * @dataProvider providerGESTEP
+     */
+	public function testGESTEP()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','GESTEP'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerGESTEP()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
+	}
+
+	public function testGetConversionGroups()
+	{
+		$result = PHPExcel_Calculation_Engineering::getConversionGroups();
+		$this->assertInternalType('array', $result);
+	}
+
+	public function testGetConversionGroupUnits()
+	{
+		$result = PHPExcel_Calculation_Engineering::getConversionGroupUnits();
+		$this->assertInternalType('array', $result);
+	}
+
+	public function testGetConversionGroupUnitDetails()
+	{
+		$result = PHPExcel_Calculation_Engineering::getConversionGroupUnitDetails();
+		$this->assertInternalType('array', $result);
+	}
+
+	public function testGetConversionMultipliers()
+	{
+		$result = PHPExcel_Calculation_Engineering::getConversionMultipliers();
+		$this->assertInternalType('array', $result);
+	}
+
+    /**
+     * @dataProvider providerCONVERTUOM
+     */
+	public function testCONVERTUOM()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_Engineering','CONVERTUOM'),$args);
+		$this->assertEquals($expectedResult, $result, NULL);
+	}
+
+    public function providerCONVERTUOM()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
+	}
+
+}
diff --git a/unitTests/PHPExcel/Calculation/FunctionsTest.php b/unitTests/PHPExcel/Calculation/FunctionsTest.php
new file mode 100644
index 00000000..cde90413
--- /dev/null
+++ b/unitTests/PHPExcel/Calculation/FunctionsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+
+require_once 'testDataFileIterator.php';
+
+class FunctionsTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        if (!defined('PHPEXCEL_ROOT'))
+        {
+            define('PHPEXCEL_ROOT', APPLICATION_PATH . '/');
+        }
+        require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	}
+
+	public function testDUMMY()
+	{
+		$result = PHPExcel_Calculation_Functions::DUMMY();
+		$this->assertEquals('#Not Yet Implemented', $result);
+	}
+
+	public function testDIV0()
+	{
+		$result = PHPExcel_Calculation_Functions::DIV0();
+		$this->assertEquals('#DIV/0!', $result);
+	}
+
+	public function testNA()
+	{
+		$result = PHPExcel_Calculation_Functions::NA();
+		$this->assertEquals('#N/A', $result);
+	}
+
+	public function testNaN()
+	{
+		$result = PHPExcel_Calculation_Functions::NaN();
+		$this->assertEquals('#NUM!', $result);
+	}
+
+	public function testNAME()
+	{
+		$result = PHPExcel_Calculation_Functions::NAME();
+		$this->assertEquals('#NAME?', $result);
+	}
+
+	public function testREF()
+	{
+		$result = PHPExcel_Calculation_Functions::REF();
+		$this->assertEquals('#REF!', $result);
+	}
+
+	public function testNULL()
+	{
+		$result = PHPExcel_Calculation_Functions::NULL();
+		$this->assertEquals('#NULL!', $result);
+	}
+
+	public function testVALUE()
+	{
+		$result = PHPExcel_Calculation_Functions::VALUE();
+		$this->assertEquals('#VALUE!', $result);
+	}
+
+}
diff --git a/unitTests/PHPExcel/Calculation/LogicalTest.php b/unitTests/PHPExcel/Calculation/LogicalTest.php
index 52ea7ec4..b7d2f0a7 100644
--- a/unitTests/PHPExcel/Calculation/LogicalTest.php
+++ b/unitTests/PHPExcel/Calculation/LogicalTest.php
@@ -40,31 +40,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerAND()
     {
-		return array(
-				array(	'#VALUE!'	),								//	No arguments
-				array(	NULL,	TRUE	),							//	NULL
-				array(	TRUE,	NULL,	TRUE	),					//	Boolean TRUE and NULL
-				array(	FALSE,	NULL,	FALSE	),					//	Boolean FALSE and NULL
-				array(	TRUE,	TRUE,	TRUE	),					//	Both TRUE Booleans
-				array(	TRUE,	FALSE,	FALSE	),					//	Mixed Booleans
-				array(	FALSE,	TRUE,	FALSE	),					//	Mixed Booleans
-				array(	FALSE,	FALSE,	FALSE	),					//	Both FALSE Booleans
-				array(	TRUE,	TRUE,	FALSE,	FALSE	),			//	Multiple Mixed Booleans
-				array(	TRUE,	TRUE,	TRUE,	TRUE	),			//	Multiple TRUE Booleans
-				array(	FALSE,	FALSE,	FALSE,	FALSE,	FALSE	),	//	Multiple FALSE Booleans
-				array(	-1,	-2,	TRUE	),
-				array(	0,	0,	FALSE	),
-				array(	0,	1,	FALSE	),
-				array(	1,	1,	TRUE	),
-				array(	'1',1,	'#VALUE!'	),
-				array(	'TRUE',1,	TRUE	),						//	'TRUE' String
-				array(	'FALSE',TRUE,	FALSE	),					//	'FALSE' String
-				array(	'ABCD',1,	'#VALUE!'	),					//	Non-numeric String
-				array(	-2,	1,	TRUE	),
-				array(	-2,	0,	FALSE	),
-			);
-
-//    	return new testDataFileIterator('rawTestData/Calculation/Logical/AND.data');
+    	return new testDataFileIterator('rawTestData/Calculation/Logical/AND.data');
 	}
 
     /**
@@ -80,30 +56,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerOR()
     {
-		return array(
-				array(	'#VALUE!'	),								//	No arguments
-				array(	NULL,	FALSE	),							//	NULL
-				array(	TRUE,	NULL,	TRUE	),					//	Boolean TRUE and NULL
-				array(	FALSE,	NULL,	FALSE	),					//	Boolean FALSE and NULL
-				array(	TRUE,	TRUE,	TRUE	),					//	Both TRUE Booleans
-				array(	TRUE,	FALSE,	TRUE	),					//	Mixed Booleans
-				array(	FALSE,	TRUE,	TRUE	),					//	Mixed Booleans
-				array(	FALSE,	FALSE,	FALSE	),					//	Both FALSE Booleans
-				array(	TRUE,	TRUE,	FALSE,	TRUE	),			//	Multiple Mixed Booleans
-				array(	TRUE,	TRUE,	TRUE,	TRUE	),			//	Multiple TRUE Booleans
-				array(	FALSE,	FALSE,	FALSE,	FALSE,	FALSE	),	//	Multiple FALSE Booleans
-				array(	-1,	-2,	TRUE	),
-				array(	0,	0,	FALSE	),
-				array(	0,	1,	TRUE	),
-				array(	1,	1,	TRUE	),
-				array(	'TRUE',1,	TRUE	),						//	'TRUE' String
-				array(	'FALSE',TRUE,	TRUE	),					//	'FALSE' String
-				array(	'ABCD',1,	'#VALUE!'	),					//	Non-numeric String
-				array(	-2,	1,	TRUE	),
-				array(	-2,	0,	TRUE	),
-			);
-
-//    	return new testDataFileIterator('rawTestData/Calculation/Logical/OR.data');
+    	return new testDataFileIterator('rawTestData/Calculation/Logical/OR.data');
 	}
 
     /**
@@ -135,17 +88,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerIF()
     {
-		return array(
-				array(	0	),
-				array(	TRUE,	0	),
-				array(	FALSE,	FALSE	),
-				array(	TRUE,	'ABC',	'ABC'	),
-				array(	FALSE,	'ABC',	FALSE	),
-				array(	TRUE,	'ABC',	'XYZ',	'ABC'	),
-				array(	FALSE,	'ABC',	'XYZ',	'XYZ'	),
-			);
-
-//    	return new testDataFileIterator('rawTestData/Calculation/Logical/IF.data');
+    	return new testDataFileIterator('rawTestData/Calculation/Logical/IF.data');
 	}
 
     /**
@@ -161,12 +104,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerIFERROR()
     {
-		return array(
-				array(	TRUE,	'Not an Error',	'Not an Error'),
-				array(	'#VALUE!',	'Error',	'Error'	),
-			);
-
-//    	return new testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
+        return new testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
 	}
 
 }
diff --git a/unitTests/PHPExcel/Calculation/MathTrigTest.php b/unitTests/PHPExcel/Calculation/MathTrigTest.php
new file mode 100644
index 00000000..09eb01e3
--- /dev/null
+++ b/unitTests/PHPExcel/Calculation/MathTrigTest.php
@@ -0,0 +1,184 @@
+<?php
+
+
+require_once 'testDataFileIterator.php';
+
+class MathTrigTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        if (!defined('PHPEXCEL_ROOT'))
+        {
+            define('PHPEXCEL_ROOT', APPLICATION_PATH . '/');
+        }
+        require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	}
+
+//	public function testDUMMY()
+//	{
+//		$result = PHPExcel_Calculation_Functions::DUMMY();
+//		$this->assertEquals('#Not Yet Implemented', $result);
+//	}
+//
+    /**
+     * @dataProvider providerATAN2
+     */
+	public function testATAN2()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','ATAN2'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerATAN2()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
+	}
+
+    /**
+     * @dataProvider providerCEILING
+     */
+	public function testCEILING()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','CEILING'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerCEILING()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
+	}
+
+    /**
+     * @dataProvider providerCOMBIN
+     */
+	public function testCOMBIN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','COMBIN'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerCOMBIN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
+	}
+
+    /**
+     * @dataProvider providerEVEN
+     */
+	public function testEVEN()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','EVEN'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerEVEN()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
+	}
+
+    /**
+     * @dataProvider providerODD
+     */
+	public function testODD()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','ODD'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerODD()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
+	}
+
+    /**
+     * @dataProvider providerFACT
+     */
+	public function testFACT()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','FACT'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerFACT()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
+	}
+
+    /**
+     * @dataProvider providerFACTDOUBLE
+     */
+	public function testFACTDOUBLE()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','FACTDOUBLE'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerFACTDOUBLE()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
+	}
+
+    /**
+     * @dataProvider providerFLOOR
+     */
+	public function testFLOOR()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','FLOOR'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerFLOOR()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
+	}
+
+    /**
+     * @dataProvider providerGCD
+     */
+	public function testGCD()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','GCD'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerGCD()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
+	}
+
+    /**
+     * @dataProvider providerLCM
+     */
+	public function testLCM()
+	{
+		$args = func_get_args();
+		$expectedResult = array_pop($args);
+		$result = call_user_func_array(array('PHPExcel_Calculation_MathTrig','LCM'),$args);
+		$this->assertEquals($expectedResult, $result, NULL, 1E-12);
+	}
+
+    public function providerLCM()
+    {
+    	return new testDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
+	}
+
+}