From 95e6c5e26469c21f419d00974e6088934e592254 Mon Sep 17 00:00:00 2001
From: Progi1984 <progi1984@gmail.com>
Date: Tue, 22 Mar 2016 15:35:50 +0100
Subject: [PATCH] #401 : Support for namespaces

---
 .../Worksheet/ColumnIterator.php              |   1 +
 .../Classes/src/Calculation/DateTimeTest.php  |  43 ++++---
 .../src/Calculation/EngineeringTest.php       | 108 +++++++++---------
 .../Classes/src/Calculation/FinancialTest.php |  65 +++++------
 .../Classes/src/Calculation/FunctionsTest.php |  29 ++---
 .../Classes/src/Calculation/LogicalTest.php   |  13 ++-
 .../Classes/src/Calculation/LookupRefTest.php |   7 +-
 .../Classes/src/Calculation/MathTrigTest.php  |  61 +++++-----
 .../Classes/src/Calculation/TextDataTest.php  |  45 ++++----
 .../src/Cell/AdvancedValueBinderTest.php      |   4 +-
 unitTests/Classes/src/Cell/DataTypeTest.php   |   3 +-
 .../src/Cell/DefaultValueBinderTest.php       |   6 +-
 unitTests/Classes/src/Cell/HyperlinkTest.php  |   3 +-
 .../src/Chart/DataSeriesValuesTest.php        |   3 +-
 unitTests/Classes/src/Chart/LayoutTest.php    |   3 +-
 unitTests/Classes/src/Chart/LegendTest.php    |   3 +-
 .../Classes/src/Reader/XEEValidatorTest.php   |   3 +-
 unitTests/Classes/src/Shared/CodePageTest.php |   5 +-
 unitTests/Classes/src/Shared/DateTest.php     |  17 +--
 unitTests/Classes/src/Shared/FileTest.php     |   3 +-
 unitTests/Classes/src/Shared/FontTest.php     |   9 +-
 .../Classes/src/Shared/PasswordHasherTest.php |   5 +-
 unitTests/Classes/src/Shared/StringTest.php   |   3 +-
 unitTests/Classes/src/Shared/TimeZoneTest.php |   3 +-
 unitTests/Classes/src/Style/ColorTest.php     |  12 +-
 .../src/Style/NumberFormatDateTest.php        |   5 +-
 .../Classes/src/Style/NumberFormatTest.php    |   5 +-
 .../Worksheet/AutoFilter/Column/RuleTest.php  |   3 +-
 .../src/Worksheet/AutoFilter/ColumnTest.php   |   3 +-
 .../src/Worksheet/RowCellIteratorTest.php     |   4 +-
 .../Classes/src/Worksheet/RowIteratorTest.php |   4 +-
 .../src/Worksheet/WorksheetColumnTest.php     |   4 +-
 .../src/Worksheet/WorksheetRowTest.php        |   4 +-
 unitTests/bootstrap.php                       |   2 +
 34 files changed, 266 insertions(+), 225 deletions(-)

diff --git a/src/PhpSpreadsheet/Worksheet/ColumnIterator.php b/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
index a6e49fd5..e1e41f60 100644
--- a/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
+++ b/src/PhpSpreadsheet/Worksheet/ColumnIterator.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace PHPExcel\Worksheet;
+
 use PHPExcel\Cell;
 use PHPExcel\Exception;
 
diff --git a/unitTests/Classes/src/Calculation/DateTimeTest.php b/unitTests/Classes/src/Calculation/DateTimeTest.php
index ac6038a4..60b1e579 100644
--- a/unitTests/Classes/src/Calculation/DateTimeTest.php
+++ b/unitTests/Classes/src/Calculation/DateTimeTest.php
@@ -1,9 +1,8 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
-require_once 'testDataFileIterator.php';
-
-class DateTimeTest extends PHPUnit_Framework_TestCase
+class DateTimeTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -24,7 +23,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerDATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/DATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/DATE.data');
     }
 
     public function testDATEtoPHP()
@@ -77,7 +76,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerDATEVALUE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data');
     }
 
     public function testDATEVALUEtoPHP()
@@ -114,7 +113,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerYEAR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/YEAR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/YEAR.data');
     }
 
     /**
@@ -130,7 +129,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerMONTH()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/MONTH.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/MONTH.data');
     }
 
     /**
@@ -146,7 +145,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerWEEKNUM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/WEEKNUM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/WEEKNUM.data');
     }
 
     /**
@@ -162,7 +161,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerWEEKDAY()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/WEEKDAY.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/WEEKDAY.data');
     }
 
     /**
@@ -178,7 +177,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerDAY()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/DAY.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/DAY.data');
     }
 
     /**
@@ -194,7 +193,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerTIME()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/TIME.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/TIME.data');
     }
 
     public function testTIMEtoPHP()
@@ -231,7 +230,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerTIMEVALUE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data');
     }
 
     public function testTIMEVALUEtoPHP()
@@ -268,7 +267,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerHOUR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/HOUR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/HOUR.data');
     }
 
     /**
@@ -284,7 +283,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerMINUTE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/MINUTE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/MINUTE.data');
     }
 
     /**
@@ -300,7 +299,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerSECOND()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/SECOND.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/SECOND.data');
     }
 
     /**
@@ -316,7 +315,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerNETWORKDAYS()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/NETWORKDAYS.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/NETWORKDAYS.data');
     }
 
     /**
@@ -332,7 +331,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerWORKDAY()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/WORKDAY.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/WORKDAY.data');
     }
 
     /**
@@ -348,7 +347,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerEDATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data');
     }
 
     public function testEDATEtoPHP()
@@ -385,7 +384,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerEOMONTH()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data');
     }
 
     public function testEOMONTHtoPHP()
@@ -422,7 +421,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerDATEDIF()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/DATEDIF.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/DATEDIF.data');
     }
 
     /**
@@ -438,7 +437,7 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerDAYS360()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/DAYS360.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/DAYS360.data');
     }
 
     /**
@@ -454,6 +453,6 @@ class DateTimeTest extends PHPUnit_Framework_TestCase
 
     public function providerYEARFRAC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/EngineeringTest.php b/unitTests/Classes/src/Calculation/EngineeringTest.php
index 8d2c9e97..5d394f95 100644
--- a/unitTests/Classes/src/Calculation/EngineeringTest.php
+++ b/unitTests/Classes/src/Calculation/EngineeringTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace PHPExcel\Calculation;
+
 //  Custom assertion class for handling precision of Complex numbers
 require_once 'custom/complexAssert.php';
 
@@ -7,7 +9,7 @@ require_once 'custom/complexAssert.php';
 require_once 'testDataFileIterator.php';
 
 
-class EngineeringTest extends PHPUnit_Framework_TestCase
+class EngineeringTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -28,7 +30,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBESSELI()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
     }
 
     /**
@@ -44,7 +46,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBESSELJ()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
     }
 
     /**
@@ -60,7 +62,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBESSELK()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
     }
 
     /**
@@ -76,7 +78,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBESSELY()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
     }
 
     /**
@@ -92,7 +94,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerCOMPLEX()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
     }
 
     /**
@@ -108,7 +110,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerIMAGINARY()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
     }
 
     /**
@@ -124,7 +126,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerIMREAL()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
     }
 
     /**
@@ -140,7 +142,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerIMABS()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
     }
 
     /**
@@ -156,7 +158,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerIMARGUMENT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
     }
 
     /**
@@ -167,13 +169,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCONJUGATE'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMCONJUGATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
     }
 
     /**
@@ -184,13 +186,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCOS'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMCOS()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
     }
 
     /**
@@ -201,13 +203,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMDIV'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMDIV()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
     }
 
     /**
@@ -218,13 +220,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMEXP'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMEXP()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
     }
 
     /**
@@ -235,13 +237,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLN'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMLN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
     }
 
     /**
@@ -252,13 +254,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG2'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMLOG2()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
     }
 
     /**
@@ -269,13 +271,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG10'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMLOG10()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
     }
 
     /**
@@ -286,13 +288,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPOWER'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMPOWER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
     }
 
     /**
@@ -303,13 +305,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPRODUCT'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMPRODUCT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
     }
 
     /**
@@ -320,13 +322,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSIN'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMSIN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
     }
 
     /**
@@ -337,13 +339,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSQRT'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMSQRT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
     }
 
     /**
@@ -354,13 +356,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUB'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMSUB()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
     }
 
     /**
@@ -371,13 +373,13 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
         $args = func_get_args();
         $expectedResult = array_pop($args);
         $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUM'), $args);
-        $complexAssert = new complexAssert();
+        $complexAssert = new \complexAssert();
         $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
     }
 
     public function providerIMSUM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
     }
 
     /**
@@ -393,7 +395,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerERF()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
     }
 
     /**
@@ -409,7 +411,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerERFC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
     }
 
     /**
@@ -425,7 +427,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBIN2DEC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
     }
 
     /**
@@ -441,7 +443,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBIN2HEX()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
     }
 
     /**
@@ -457,7 +459,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerBIN2OCT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
     }
 
     /**
@@ -473,7 +475,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerDEC2BIN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
     }
 
     /**
@@ -489,7 +491,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerDEC2HEX()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
     }
 
     /**
@@ -505,7 +507,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerDEC2OCT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
     }
 
     /**
@@ -521,7 +523,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerHEX2BIN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
     }
 
     /**
@@ -537,7 +539,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerHEX2DEC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
     }
 
     /**
@@ -553,7 +555,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerHEX2OCT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
     }
 
     /**
@@ -569,7 +571,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerOCT2BIN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
     }
 
     /**
@@ -585,7 +587,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerOCT2DEC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
     }
 
     /**
@@ -601,7 +603,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerOCT2HEX()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
     }
 
     /**
@@ -617,7 +619,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerDELTA()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
     }
 
     /**
@@ -633,7 +635,7 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerGESTEP()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
     }
 
     public function testGetConversionGroups()
@@ -673,6 +675,6 @@ class EngineeringTest extends PHPUnit_Framework_TestCase
 
     public function providerCONVERTUOM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/FinancialTest.php b/unitTests/Classes/src/Calculation/FinancialTest.php
index fd6a1b11..4e6b02d7 100644
--- a/unitTests/Classes/src/Calculation/FinancialTest.php
+++ b/unitTests/Classes/src/Calculation/FinancialTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class FinancialTest extends PHPUnit_Framework_TestCase
+class FinancialTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -24,7 +25,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerACCRINT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
     }
 
     /**
@@ -40,7 +41,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerACCRINTM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
     }
 
     /**
@@ -56,7 +57,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerAMORDEGRC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
     }
 
     /**
@@ -72,7 +73,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerAMORLINC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
     }
 
     /**
@@ -88,7 +89,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYBS()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
     }
 
     /**
@@ -104,7 +105,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYS()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
     }
 
     /**
@@ -120,7 +121,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPDAYSNC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
     }
 
     /**
@@ -136,7 +137,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPNCD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
     }
 
     /**
@@ -152,7 +153,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPNUM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
     }
 
     /**
@@ -168,7 +169,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCOUPPCD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
     }
 
     /**
@@ -184,7 +185,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCUMIPMT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
     }
 
     /**
@@ -200,7 +201,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerCUMPRINC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
     }
 
     /**
@@ -216,7 +217,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerDB()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/DB.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/DB.data');
     }
 
     /**
@@ -232,7 +233,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerDDB()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
     }
 
     /**
@@ -248,7 +249,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerDISC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
     }
 
     /**
@@ -264,7 +265,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerDOLLARDE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
     }
 
     /**
@@ -280,7 +281,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerDOLLARFR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
     }
 
     /**
@@ -296,7 +297,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerEFFECT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
     }
 
     /**
@@ -312,7 +313,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerFV()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/FV.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/FV.data');
     }
 
     /**
@@ -328,7 +329,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerFVSCHEDULE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
     }
 
     /**
@@ -344,7 +345,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerINTRATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
     }
 
     /**
@@ -360,7 +361,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerIPMT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
     }
 
     /**
@@ -376,7 +377,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerIRR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
     }
 
     /**
@@ -392,7 +393,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerISPMT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
     }
 
     /**
@@ -408,7 +409,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerMIRR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
     }
 
     /**
@@ -424,7 +425,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerNOMINAL()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
     }
 
     /**
@@ -440,7 +441,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerNPER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
     }
 
     /**
@@ -456,7 +457,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerNPV()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
     }
 
     /**
@@ -472,7 +473,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerPRICE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
     }
 
     /**
@@ -488,7 +489,7 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerRATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
     }
 
     /**
@@ -504,6 +505,6 @@ class FinancialTest extends PHPUnit_Framework_TestCase
 
     public function providerXIRR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/FunctionsTest.php b/unitTests/Classes/src/Calculation/FunctionsTest.php
index 7337525a..9ee1b5a5 100644
--- a/unitTests/Classes/src/Calculation/FunctionsTest.php
+++ b/unitTests/Classes/src/Calculation/FunctionsTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class FunctionsTest extends PHPUnit_Framework_TestCase
+class FunctionsTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -72,7 +73,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_BLANK()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
     }
 
     /**
@@ -88,7 +89,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_ERR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
     }
 
     /**
@@ -104,7 +105,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_ERROR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
     }
 
     /**
@@ -120,7 +121,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerERROR_TYPE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
     }
 
     /**
@@ -136,7 +137,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_LOGICAL()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
     }
 
     /**
@@ -152,7 +153,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_NA()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
     }
 
     /**
@@ -168,7 +169,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_NUMBER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
     }
 
     /**
@@ -184,7 +185,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_TEXT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
     }
 
     /**
@@ -200,7 +201,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_NONTEXT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
     }
 
     /**
@@ -216,7 +217,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_EVEN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
     }
 
     /**
@@ -232,7 +233,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerIS_ODD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
     }
 
     /**
@@ -248,7 +249,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerTYPE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
     }
 
     /**
@@ -264,6 +265,6 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
 
     public function providerN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Functions/N.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Functions/N.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/LogicalTest.php b/unitTests/Classes/src/Calculation/LogicalTest.php
index e370a498..71d90f34 100644
--- a/unitTests/Classes/src/Calculation/LogicalTest.php
+++ b/unitTests/Classes/src/Calculation/LogicalTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class LogicalTest extends PHPUnit_Framework_TestCase
+class LogicalTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -36,7 +37,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerAND()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Logical/AND.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Logical/AND.data');
     }
 
     /**
@@ -52,7 +53,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerOR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Logical/OR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Logical/OR.data');
     }
 
     /**
@@ -68,7 +69,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerNOT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
     }
 
     /**
@@ -84,7 +85,7 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerIF()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Logical/IF.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Logical/IF.data');
     }
 
     /**
@@ -100,6 +101,6 @@ class LogicalTest extends PHPUnit_Framework_TestCase
 
     public function providerIFERROR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/LookupRefTest.php b/unitTests/Classes/src/Calculation/LookupRefTest.php
index f00befcc..6d467f2e 100644
--- a/unitTests/Classes/src/Calculation/LookupRefTest.php
+++ b/unitTests/Classes/src/Calculation/LookupRefTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class LookupRefTest extends PHPUnit_Framework_TestCase
+class LookupRefTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -24,7 +25,7 @@ class LookupRefTest extends PHPUnit_Framework_TestCase
 
     public function providerHLOOKUP()
     {
-        return new testDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
+        return new \testDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
     }
 
     /**
@@ -40,6 +41,6 @@ class LookupRefTest extends PHPUnit_Framework_TestCase
 
     public function providerVLOOKUP()
     {
-        return new testDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
+        return new \testDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
     }
 }
diff --git a/unitTests/Classes/src/Calculation/MathTrigTest.php b/unitTests/Classes/src/Calculation/MathTrigTest.php
index 1cf13bce..9d599c5c 100644
--- a/unitTests/Classes/src/Calculation/MathTrigTest.php
+++ b/unitTests/Classes/src/Calculation/MathTrigTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class MathTrigTest extends PHPUnit_Framework_TestCase
+class MathTrigTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -24,7 +25,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerATAN2()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
     }
 
     /**
@@ -40,7 +41,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerCEILING()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
     }
 
     /**
@@ -56,7 +57,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerCOMBIN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
     }
 
     /**
@@ -72,7 +73,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerEVEN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
     }
 
     /**
@@ -88,7 +89,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerODD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
     }
 
     /**
@@ -104,7 +105,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerFACT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
     }
 
     /**
@@ -120,7 +121,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerFACTDOUBLE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
     }
 
     /**
@@ -136,7 +137,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerFLOOR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
     }
 
     /**
@@ -152,7 +153,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerGCD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
     }
 
     /**
@@ -168,7 +169,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerLCM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
     }
 
     /**
@@ -184,7 +185,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerINT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
     }
 
     /**
@@ -200,7 +201,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerSIGN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
     }
 
     /**
@@ -216,7 +217,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerPOWER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
     }
 
     /**
@@ -232,7 +233,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerLOG()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
     }
 
     /**
@@ -248,7 +249,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMOD()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
     }
 
     /**
@@ -264,7 +265,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMDETERM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
     }
 
     /**
@@ -280,7 +281,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMINVERSE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
     }
 
     /**
@@ -296,7 +297,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMMULT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
     }
 
     /**
@@ -312,7 +313,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMULTINOMIAL()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
     }
 
     /**
@@ -330,7 +331,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerMROUND()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
     }
 
     /**
@@ -346,7 +347,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerPRODUCT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
     }
 
     /**
@@ -362,7 +363,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerQUOTIENT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
     }
 
     /**
@@ -378,7 +379,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerROUNDUP()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
     }
 
     /**
@@ -394,7 +395,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerROUNDDOWN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
     }
 
     /**
@@ -410,7 +411,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerSERIESSUM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
     }
 
     /**
@@ -426,7 +427,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerSUMSQ()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
     }
 
     /**
@@ -442,7 +443,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerTRUNC()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
     }
 
     /**
@@ -458,7 +459,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerROMAN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
     }
 
     /**
@@ -474,7 +475,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
 
     public function providerSQRTPI()
     {
-        return new testDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
+        return new \testDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
     }
 
     /**
diff --git a/unitTests/Classes/src/Calculation/TextDataTest.php b/unitTests/Classes/src/Calculation/TextDataTest.php
index 39a408cd..da3f8823 100644
--- a/unitTests/Classes/src/Calculation/TextDataTest.php
+++ b/unitTests/Classes/src/Calculation/TextDataTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Calculation;
 
 require_once 'testDataFileIterator.php';
 
-class TextDataTest extends PHPUnit_Framework_TestCase
+class TextDataTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -24,7 +25,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerCHAR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
     }
 
     /**
@@ -40,7 +41,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerCODE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
     }
 
     /**
@@ -56,7 +57,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerCONCATENATE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
     }
 
     /**
@@ -72,7 +73,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerLEFT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
     }
 
     /**
@@ -88,7 +89,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerMID()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/MID.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/MID.data');
     }
 
     /**
@@ -104,7 +105,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerRIGHT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
     }
 
     /**
@@ -120,7 +121,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerLOWER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
     }
 
     /**
@@ -136,7 +137,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerUPPER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
     }
 
     /**
@@ -152,7 +153,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerPROPER()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
     }
 
     /**
@@ -168,7 +169,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerLEN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
     }
 
     /**
@@ -184,7 +185,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerSEARCH()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
     }
 
     /**
@@ -200,7 +201,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerFIND()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
     }
 
     /**
@@ -216,7 +217,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerREPLACE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
     }
 
     /**
@@ -232,7 +233,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerSUBSTITUTE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
     }
 
     /**
@@ -248,7 +249,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerTRIM()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
     }
 
     /**
@@ -264,7 +265,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerCLEAN()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
     }
 
     /**
@@ -280,7 +281,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerDOLLAR()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
     }
 
     /**
@@ -296,7 +297,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerFIXED()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
     }
 
     /**
@@ -312,7 +313,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/T.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/T.data');
     }
 
     /**
@@ -333,7 +334,7 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerTEXT()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
     }
 
     /**
@@ -353,6 +354,6 @@ class TextDataTest extends PHPUnit_Framework_TestCase
 
     public function providerVALUE()
     {
-        return new testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
+        return new \testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
     }
 }
diff --git a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php b/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php
index 802eee85..623c030c 100644
--- a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php
+++ b/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class AdvancedValueBinderTest extends PHPUnit_Framework_TestCase
+namespace PHPExcel\Cell;
+
+class AdvancedValueBinderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
diff --git a/unitTests/Classes/src/Cell/DataTypeTest.php b/unitTests/Classes/src/Cell/DataTypeTest.php
index 019a8d49..601eaa27 100644
--- a/unitTests/Classes/src/Cell/DataTypeTest.php
+++ b/unitTests/Classes/src/Cell/DataTypeTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Cell;
 
-class DataTypeTest extends PHPUnit_Framework_TestCase
+class DataTypeTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
diff --git a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php b/unitTests/Classes/src/Cell/DefaultValueBinderTest.php
index aebee164..49ca2cfb 100644
--- a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php
+++ b/unitTests/Classes/src/Cell/DefaultValueBinderTest.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace PHPExcel\Cell;
+
 require_once 'testDataFileIteratorJson.php';
 
-class DefaultValueBinderTest extends PHPUnit_Framework_TestCase
+class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
 {
     protected $cellStub;
 
@@ -68,7 +70,7 @@ class DefaultValueBinderTest extends PHPUnit_Framework_TestCase
 
     public function providerDataTypeForValue()
     {
-        return new testDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
+        return new \testDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
     }
 
     public function testDataTypeForRichTextObject()
diff --git a/unitTests/Classes/src/Cell/HyperlinkTest.php b/unitTests/Classes/src/Cell/HyperlinkTest.php
index 99825860..8586544c 100644
--- a/unitTests/Classes/src/Cell/HyperlinkTest.php
+++ b/unitTests/Classes/src/Cell/HyperlinkTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Cell;
 
-class HyperlinkTest extends PHPUnit_Framework_TestCase
+class HyperlinkTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
diff --git a/unitTests/Classes/src/Chart/DataSeriesValuesTest.php b/unitTests/Classes/src/Chart/DataSeriesValuesTest.php
index b796575e..7812df2e 100644
--- a/unitTests/Classes/src/Chart/DataSeriesValuesTest.php
+++ b/unitTests/Classes/src/Chart/DataSeriesValuesTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Chart;
 
-class DataSeriesValuesTest extends PHPUnit_Framework_TestCase
+class DataSeriesValuesTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetDataType()
     {
diff --git a/unitTests/Classes/src/Chart/LayoutTest.php b/unitTests/Classes/src/Chart/LayoutTest.php
index 8574dfc6..24351207 100644
--- a/unitTests/Classes/src/Chart/LayoutTest.php
+++ b/unitTests/Classes/src/Chart/LayoutTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Chart;
 
-class LayoutTest extends PHPUnit_Framework_TestCase
+class LayoutTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetLayoutTarget()
     {
diff --git a/unitTests/Classes/src/Chart/LegendTest.php b/unitTests/Classes/src/Chart/LegendTest.php
index e9eced4c..ec19c60b 100644
--- a/unitTests/Classes/src/Chart/LegendTest.php
+++ b/unitTests/Classes/src/Chart/LegendTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Chart;
 
-class LegendTest extends PHPUnit_Framework_TestCase
+class LegendTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetPosition()
     {
diff --git a/unitTests/Classes/src/Reader/XEEValidatorTest.php b/unitTests/Classes/src/Reader/XEEValidatorTest.php
index a033bdfb..deba3804 100644
--- a/unitTests/Classes/src/Reader/XEEValidatorTest.php
+++ b/unitTests/Classes/src/Reader/XEEValidatorTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Reader;
 
-class XEEValidatorTest extends PHPUnit_Framework_TestCase
+class XEEValidatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerInvalidXML
diff --git a/unitTests/Classes/src/Shared/CodePageTest.php b/unitTests/Classes/src/Shared/CodePageTest.php
index 7d261bc3..5d7ad97f 100644
--- a/unitTests/Classes/src/Shared/CodePageTest.php
+++ b/unitTests/Classes/src/Shared/CodePageTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class CodePageTest extends PHPUnit_Framework_TestCase
+class CodePageTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerCodePage
@@ -18,7 +19,7 @@ class CodePageTest extends PHPUnit_Framework_TestCase
 
     public function providerCodePage()
     {
-        return new testDataFileIterator('rawTestData/Shared/CodePage.data');
+        return new \testDataFileIterator('rawTestData/Shared/CodePage.data');
     }
 
     public function testNumberToNameWithInvalidCodePage()
diff --git a/unitTests/Classes/src/Shared/DateTest.php b/unitTests/Classes/src/Shared/DateTest.php
index c8649738..121bbe00 100644
--- a/unitTests/Classes/src/Shared/DateTest.php
+++ b/unitTests/Classes/src/Shared/DateTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class DateTest extends PHPUnit_Framework_TestCase
+class DateTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetExcelCalendar()
     {
@@ -46,7 +47,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1900()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data');
     }
 
     /**
@@ -67,7 +68,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimePHPToExcel1900()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data');
     }
 
     /**
@@ -88,7 +89,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimeFormattedPHPToExcel1900()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data');
     }
 
     /**
@@ -112,7 +113,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1904()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data');
     }
 
     /**
@@ -133,7 +134,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimePHPToExcel1904()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data');
     }
 
     /**
@@ -149,7 +150,7 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerIsDateTimeFormatCode()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data');
     }
 
     /**
@@ -173,6 +174,6 @@ class DateTest extends PHPUnit_Framework_TestCase
 
     public function providerDateTimeExcelToPHP1900Timezone()
     {
-        return new testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data');
+        return new \testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/FileTest.php b/unitTests/Classes/src/Shared/FileTest.php
index 06ede7e8..b7a525d1 100644
--- a/unitTests/Classes/src/Shared/FileTest.php
+++ b/unitTests/Classes/src/Shared/FileTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class FileTest extends PHPUnit_Framework_TestCase
+class FileTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetUseUploadTempDirectory()
     {
diff --git a/unitTests/Classes/src/Shared/FontTest.php b/unitTests/Classes/src/Shared/FontTest.php
index 1f1fe2f0..d94062dd 100644
--- a/unitTests/Classes/src/Shared/FontTest.php
+++ b/unitTests/Classes/src/Shared/FontTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class FontTest extends PHPUnit_Framework_TestCase
+class FontTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetAutoSizeMethod()
     {
@@ -47,7 +48,7 @@ class FontTest extends PHPUnit_Framework_TestCase
 
     public function providerFontSizeToPixels()
     {
-        return new testDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
+        return new \testDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
     }
 
     /**
@@ -63,7 +64,7 @@ class FontTest extends PHPUnit_Framework_TestCase
 
     public function providerInchSizeToPixels()
     {
-        return new testDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
+        return new \testDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
     }
 
     /**
@@ -79,6 +80,6 @@ class FontTest extends PHPUnit_Framework_TestCase
 
     public function providerCentimeterSizeToPixels()
     {
-        return new testDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
+        return new \testDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/PasswordHasherTest.php b/unitTests/Classes/src/Shared/PasswordHasherTest.php
index a86a1ee5..7cec0492 100644
--- a/unitTests/Classes/src/Shared/PasswordHasherTest.php
+++ b/unitTests/Classes/src/Shared/PasswordHasherTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class PasswordHasherTest extends PHPUnit_Framework_TestCase
+class PasswordHasherTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerHashPassword
@@ -18,6 +19,6 @@ class PasswordHasherTest extends PHPUnit_Framework_TestCase
 
     public function providerHashPassword()
     {
-        return new testDataFileIterator('rawTestData/Shared/PasswordHashes.data');
+        return new \testDataFileIterator('rawTestData/Shared/PasswordHashes.data');
     }
 }
diff --git a/unitTests/Classes/src/Shared/StringTest.php b/unitTests/Classes/src/Shared/StringTest.php
index 5df90ea8..7365ce29 100644
--- a/unitTests/Classes/src/Shared/StringTest.php
+++ b/unitTests/Classes/src/Shared/StringTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Shared;
 
 require_once 'testDataFileIterator.php';
 
-class StringTest extends PHPUnit_Framework_TestCase
+class StringTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetIsMbStringEnabled()
     {
diff --git a/unitTests/Classes/src/Shared/TimeZoneTest.php b/unitTests/Classes/src/Shared/TimeZoneTest.php
index 40edf950..a074abe2 100644
--- a/unitTests/Classes/src/Shared/TimeZoneTest.php
+++ b/unitTests/Classes/src/Shared/TimeZoneTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Shared;
 
-class TimeZoneTest extends PHPUnit_Framework_TestCase
+class TimeZoneTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetTimezone()
     {
diff --git a/unitTests/Classes/src/Style/ColorTest.php b/unitTests/Classes/src/Style/ColorTest.php
index c590260e..d01e1962 100644
--- a/unitTests/Classes/src/Style/ColorTest.php
+++ b/unitTests/Classes/src/Style/ColorTest.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace PHPExcel\Style;
+
 require_once 'testDataFileIterator.php';
 require_once 'testDataFileIteratorJson.php';
 
-class ColorTest extends PHPUnit_Framework_TestCase
+class ColorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerColorGetRed
@@ -18,7 +20,7 @@ class ColorTest extends PHPUnit_Framework_TestCase
 
     public function providerColorGetRed()
     {
-        return new testDataFileIterator('rawTestData/Style/ColorGetRed.data');
+        return new \testDataFileIterator('rawTestData/Style/ColorGetRed.data');
     }
 
     /**
@@ -34,7 +36,7 @@ class ColorTest extends PHPUnit_Framework_TestCase
 
     public function providerColorGetGreen()
     {
-        return new testDataFileIterator('rawTestData/Style/ColorGetGreen.data');
+        return new \testDataFileIterator('rawTestData/Style/ColorGetGreen.data');
     }
 
     /**
@@ -50,7 +52,7 @@ class ColorTest extends PHPUnit_Framework_TestCase
 
     public function providerColorGetBlue()
     {
-        return new testDataFileIterator('rawTestData/Style/ColorGetBlue.data');
+        return new \testDataFileIterator('rawTestData/Style/ColorGetBlue.data');
     }
 
     /**
@@ -65,6 +67,6 @@ class ColorTest extends PHPUnit_Framework_TestCase
 
     public function providerColorChangeBrightness()
     {
-        return new testDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
+        return new \testDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
     }
 }
diff --git a/unitTests/Classes/src/Style/NumberFormatDateTest.php b/unitTests/Classes/src/Style/NumberFormatDateTest.php
index da36aee6..8bbb28d4 100644
--- a/unitTests/Classes/src/Style/NumberFormatDateTest.php
+++ b/unitTests/Classes/src/Style/NumberFormatDateTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Style;
 
 require_once 'testDataFileIterator.php';
 
-class NumberFormatDateTest extends PHPUnit_Framework_TestCase
+class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -25,6 +26,6 @@ class NumberFormatDateTest extends PHPUnit_Framework_TestCase
 
     public function providerNumberFormat()
     {
-        return new testDataFileIterator('rawTestData/Style/NumberFormatDates.data');
+        return new \testDataFileIterator('rawTestData/Style/NumberFormatDates.data');
     }
 }
diff --git a/unitTests/Classes/src/Style/NumberFormatTest.php b/unitTests/Classes/src/Style/NumberFormatTest.php
index 170ff868..e723d714 100644
--- a/unitTests/Classes/src/Style/NumberFormatTest.php
+++ b/unitTests/Classes/src/Style/NumberFormatTest.php
@@ -1,9 +1,10 @@
 <?php
 
+namespace PHPExcel\Style;
 
 require_once 'testDataFileIterator.php';
 
-class NumberFormatTest extends PHPUnit_Framework_TestCase
+class NumberFormatTest extends \PHPUnit_Framework_TestCase
 {
 
     public function setUp()
@@ -25,6 +26,6 @@ class NumberFormatTest extends PHPUnit_Framework_TestCase
 
     public function providerNumberFormat()
     {
-        return new testDataFileIterator('rawTestData/Style/NumberFormat.data');
+        return new \testDataFileIterator('rawTestData/Style/NumberFormat.data');
     }
 }
diff --git a/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php b/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php
index ffeaa85e..ec83ac96 100644
--- a/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php
+++ b/unitTests/Classes/src/Worksheet/AutoFilter/Column/RuleTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Worksheet\AutoFilter\Column;
 
-class RuleTest extends PHPUnit_Framework_TestCase
+class RuleTest extends \PHPUnit_Framework_TestCase
 {
     private $_testAutoFilterRuleObject;
 
diff --git a/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php b/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php
index 0a8b4461..258f248a 100644
--- a/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php
+++ b/unitTests/Classes/src/Worksheet/AutoFilter/ColumnTest.php
@@ -1,7 +1,8 @@
 <?php
 
+namespace PHPExcel\Worksheet\AutoFilter;
 
-class AutofilterColumnTest extends PHPUnit_Framework_TestCase
+class AutofilterColumnTest extends \PHPUnit_Framework_TestCase
 {
     private $_testInitialColumn = 'H';
 
diff --git a/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php b/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php
index 3eeb0ac2..098d6b98 100644
--- a/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php
+++ b/unitTests/Classes/src/Worksheet/RowCellIteratorTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class RowCellIteratorTest extends PHPUnit_Framework_TestCase
+namespace PHPExcel\Worksheet;
+
+class RowCellIteratorTest extends \PHPUnit_Framework_TestCase
 {
     public $mockWorksheet;
     public $mockRowCell;
diff --git a/unitTests/Classes/src/Worksheet/RowIteratorTest.php b/unitTests/Classes/src/Worksheet/RowIteratorTest.php
index c02b0632..c81c2670 100644
--- a/unitTests/Classes/src/Worksheet/RowIteratorTest.php
+++ b/unitTests/Classes/src/Worksheet/RowIteratorTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class RowIteratorTest extends PHPUnit_Framework_TestCase
+namespace PHPExcel\Worksheet;
+
+class RowIteratorTest extends \PHPUnit_Framework_TestCase
 {
     public $mockWorksheet;
     public $mockRow;
diff --git a/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php b/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php
index 78d9cecf..510fc8e4 100644
--- a/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php
+++ b/unitTests/Classes/src/Worksheet/WorksheetColumnTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class WorksheetColumnTest extends PHPUnit_Framework_TestCase
+namespace PHPExcel\Worksheet;
+
+class WorksheetColumnTest extends \PHPUnit_Framework_TestCase
 {
     public $mockWorksheet;
     public $mockColumn;
diff --git a/unitTests/Classes/src/Worksheet/WorksheetRowTest.php b/unitTests/Classes/src/Worksheet/WorksheetRowTest.php
index 0617a6c7..c2cf403c 100644
--- a/unitTests/Classes/src/Worksheet/WorksheetRowTest.php
+++ b/unitTests/Classes/src/Worksheet/WorksheetRowTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class WorksheetRowTest extends PHPUnit_Framework_TestCase
+namespace PHPExcel\Worksheet;
+
+class WorksheetRowTest extends \PHPUnit_Framework_TestCase
 {
     public $mockWorksheet;
     public $mockRow;
diff --git a/unitTests/bootstrap.php b/unitTests/bootstrap.php
index 885f592a..19959f1b 100644
--- a/unitTests/bootstrap.php
+++ b/unitTests/bootstrap.php
@@ -40,6 +40,8 @@ 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.