From fefa6d18f14af001d1df43a5f510c5384302879a Mon Sep 17 00:00:00 2001
From: Ivan Klimchuk <klimchuk@1pt.com>
Date: Mon, 24 Aug 2015 19:16:49 +0300
Subject: [PATCH] Fixed unused use statements

---
 test/qtism/data/storage/UtilsTest.php                      | 3 +--
 .../storage/php/marshalling/PhpMarshallingContextTest.php  | 4 +---
 .../data/storage/xml/XmlCompactAssessmentDocumentTest.php  | 4 +---
 .../data/storage/xml/marshalling/AnyNMarshallerTest.php    | 4 +---
 .../storage/xml/marshalling/AreaMapEntryMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/AreaMappingMarshallerTest.php  | 4 +---
 .../xml/marshalling/AssessmentItemMarshallerTest.php       | 5 +----
 .../xml/marshalling/AssessmentItemRefMarshallerTest.php    | 4 +---
 .../xml/marshalling/AssessmentSectionMarshallerTest.php    | 4 +---
 .../xml/marshalling/AssessmentSectionRefMarshallerTest.php | 4 +---
 .../xml/marshalling/AssessmentTestMarshallerTest.php       | 4 +---
 .../storage/xml/marshalling/BaseValueMarshallerTest.php    | 5 +----
 .../storage/xml/marshalling/BlockquoteMarshallerTest.php   | 3 +--
 .../storage/xml/marshalling/BranchRuleMarshallerTest.php   | 4 +---
 .../data/storage/xml/marshalling/CorrectMarshallerTest.php | 4 +---
 .../xml/marshalling/CorrectResponseMarshallerTest.php      | 4 +---
 .../xml/marshalling/CustomOperatorMarshallerTest.php       | 3 +--
 .../storage/xml/marshalling/DefaultValMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/DefaultValueMarshallerTest.php | 4 +---
 .../data/storage/xml/marshalling/DivMarshallerTest.php     | 3 +--
 .../data/storage/xml/marshalling/DlMarshallerTest.php      | 3 +--
 .../data/storage/xml/marshalling/EqualMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/EqualRoundedMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/ExitResponseMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/ExitTestMarshallerTest.php     | 4 +---
 .../storage/xml/marshalling/FieldValueMarshallerTest.php   | 4 +---
 .../data/storage/xml/marshalling/IndexMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/InfoControlMarshallerTest.php  | 4 +---
 .../data/storage/xml/marshalling/InsideMarshallerTest.php  | 4 +---
 .../marshalling/InterpolationTableEntryMarshallerTest.php  | 5 +----
 .../xml/marshalling/InterpolationTableMarshallerTest.php   | 5 +----
 .../storage/xml/marshalling/ItemBodyMarshallerTest.php     | 3 +--
 .../xml/marshalling/ItemSessionControlMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/ItemSubsetMarshallerTest.php   | 4 +---
 .../data/storage/xml/marshalling/ListMarshallerTest.php    | 3 +--
 .../xml/marshalling/LookupOutcomeValueMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/MapEntryMarshallerTest.php     | 4 +---
 .../storage/xml/marshalling/MapResponseMarshallerTest.php  | 4 +---
 .../xml/marshalling/MapResponsePointMarshallerTest.php     | 4 +---
 .../data/storage/xml/marshalling/MappingMarshallerTest.php | 4 +---
 test/qtism/data/storage/xml/marshalling/MarshallerTest.php | 3 +--
 .../xml/marshalling/MatchTableEntryMarshallerTest.php      | 7 +------
 .../storage/xml/marshalling/MatchTableMarshallerTest.php   | 5 +----
 .../storage/xml/marshalling/MathConstantMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/MathOperatorMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/NullValueMarshallerTest.php    | 4 +---
 .../xml/marshalling/NumberCorrectMarshallerTest.php        | 4 +---
 .../xml/marshalling/NumberIncorrectMarshallerTest.php      | 4 +---
 .../xml/marshalling/NumberPresentedMarshallerTest.php      | 4 +---
 .../xml/marshalling/NumberRespondedMarshallerTest.php      | 4 +---
 .../xml/marshalling/NumberSelectedMarshallerTest.php       | 4 +---
 .../data/storage/xml/marshalling/ObjectMarshallerTest.php  | 3 +--
 .../storage/xml/marshalling/OperatorMarshallerTest.php     | 4 +---
 .../storage/xml/marshalling/OrderingMarshallerTest.php     | 4 +---
 .../xml/marshalling/OutcomeConditionMarshallerTest.php     | 4 +---
 .../xml/marshalling/OutcomeControlMarshallerTest.php       | 4 +---
 .../xml/marshalling/OutcomeDeclarationMarshallerTest.php   | 4 +---
 .../xml/marshalling/OutcomeMaximumMarshallerTest.php       | 5 +----
 .../xml/marshalling/OutcomeMinimumMarshallerTest.php       | 5 +----
 .../xml/marshalling/OutcomeProcessingMarshallerTest.php    | 4 +---
 .../storage/xml/marshalling/PatternMatchMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/PreConditionMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/RandomFloatMarshallerTest.php  | 4 +---
 .../xml/marshalling/RandomIntegerMarshallerTest.php        | 4 +---
 .../data/storage/xml/marshalling/RepeatMarshallerTest.php  | 4 +---
 .../xml/marshalling/ResponseDeclarationMarshallerTest.php  | 5 +----
 .../data/storage/xml/marshalling/RoundToMarshallerTest.php | 4 +---
 .../storage/xml/marshalling/RubricBlockMarshallerTest.php  | 3 +--
 .../storage/xml/marshalling/SectionPartMarshallerTest.php  | 4 +---
 .../storage/xml/marshalling/SelectionMarshallerTest.php    | 4 +---
 .../xml/marshalling/SetOutcomeValueMarshallerTest.php      | 4 +---
 .../storage/xml/marshalling/SimpleInlineMarshallerTest.php | 3 +--
 .../xml/marshalling/StatsOperatorMarshallerTest.php        | 4 +---
 .../storage/xml/marshalling/StringMatchMarshallerTest.php  | 4 +---
 .../storage/xml/marshalling/StylesheetMarshallerTest.php   | 4 +---
 .../storage/xml/marshalling/SubstringMarshallerTest.php    | 4 +---
 .../data/storage/xml/marshalling/TableMarshallerTest.php   | 3 +--
 .../xml/marshalling/TemplateDefaultMarshallerTest.php      | 4 +---
 .../storage/xml/marshalling/TestFeedbackMarshallerTest.php | 7 +------
 .../storage/xml/marshalling/TestPartMarshallerTest.php     | 6 +-----
 .../xml/marshalling/TestVariablesMarshallerTest.php        | 4 +---
 .../storage/xml/marshalling/TimeLimitsMarshallerTest.php   | 4 +---
 .../data/storage/xml/marshalling/ValueMarshallerTest.php   | 4 +---
 .../xml/marshalling/VariableDeclarationMarshallerTest.php  | 4 +---
 .../xml/marshalling/VariableMappingMarshallerTest.php      | 4 +---
 .../storage/xml/marshalling/VariableMarshallerTest.php     | 4 +---
 .../data/storage/xml/marshalling/WeightMarshallerTest.php  | 4 +---
 87 files changed, 87 insertions(+), 265 deletions(-)

diff --git a/test/qtism/data/storage/UtilsTest.php b/test/qtism/data/storage/UtilsTest.php
index 992824b85..841d8db3e 100644
--- a/test/qtism/data/storage/UtilsTest.php
+++ b/test/qtism/data/storage/UtilsTest.php
@@ -6,7 +6,6 @@
 use qtism\data\storage\Utils;
 use qtism\common\enums\BaseType;
 use qtism\common\datatypes\Shape;
-use \stdClass;
 
 require_once (dirname(__FILE__) . '/../../../QtiSmTestCase.php');
 
@@ -358,4 +357,4 @@ public function invalidUriToSanitizeProvider() {
 			array(true)
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/php/marshalling/PhpMarshallingContextTest.php b/test/qtism/data/storage/php/marshalling/PhpMarshallingContextTest.php
index 7e1e1f5d8..6ed2d54e7 100644
--- a/test/qtism/data/storage/php/marshalling/PhpMarshallingContextTest.php
+++ b/test/qtism/data/storage/php/marshalling/PhpMarshallingContextTest.php
@@ -6,8 +6,6 @@
 use qtism\common\storage\MemoryStream;
 use qtism\data\storage\php\marshalling\PhpMarshallingContext;
 use qtism\data\storage\php\PhpStreamAccess;
-use \RuntimeException;
-use \InvalidArgumentException;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -119,4 +117,4 @@ public function testGenerateVariableName() {
         $this->assertEquals('point_1', $ctx->generateVariableName(new Point(0, 1)));
         $this->assertEquals('coords_2', $ctx->generateVariableName(new Coords(Shape::CIRCLE, array(5, 5, 3))));
     }
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/XmlCompactAssessmentDocumentTest.php b/test/qtism/data/storage/xml/XmlCompactAssessmentDocumentTest.php
index dad22a88a..3f4f6820d 100644
--- a/test/qtism/data/storage/xml/XmlCompactAssessmentDocumentTest.php
+++ b/test/qtism/data/storage/xml/XmlCompactAssessmentDocumentTest.php
@@ -4,8 +4,6 @@
 use qtism\data\storage\LocalFileResolver;
 use qtism\data\NavigationMode;
 use qtism\data\storage\xml\XmlDocument;
-use qtism\data\AssessmentTest;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../QtiSmTestCase.php');
 
@@ -217,4 +215,4 @@ public function testExplodeRubricBlocks() {
 	    
 	    unlink($file);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AnyNMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AnyNMarshallerTest.php
index ff04540e4..0771ffd2a 100644
--- a/test/qtism/data/storage/xml/marshalling/AnyNMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AnyNMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\AnyN;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -53,4 +51,4 @@ public function testUnmarshall() {
 		$this->assertEquals(2, $component->getMax());
 		$this->assertEquals(3, count($component->getExpressions()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AreaMapEntryMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AreaMapEntryMarshallerTest.php
index 50bedcb76..093b5a9f5 100644
--- a/test/qtism/data/storage/xml/marshalling/AreaMapEntryMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AreaMapEntryMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\AreaMapEntry;
 use qtism\common\datatypes\Shape;
 use qtism\common\datatypes\Coords;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -41,4 +39,4 @@ public function testUnmarshall() {
 		$this->assertInternalType('float', $component->getMappedValue());
 		$this->assertEquals(1.337, $component->getMappedValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AreaMappingMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AreaMappingMarshallerTest.php
index 65791943f..e689d2f52 100644
--- a/test/qtism/data/storage/xml/marshalling/AreaMappingMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AreaMappingMarshallerTest.php
@@ -2,11 +2,9 @@
 
 use qtism\common\datatypes\Coords;
 use qtism\common\datatypes\Shape;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\AreaMapping;
 use qtism\data\state\AreaMapEntry;
 use qtism\data\state\AreaMapEntryCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +44,4 @@ public function testUnmarshallMinimal() {
 		
 		$this->assertInstanceOf('qtism\\data\\state\\AreaMapping', $component);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AssessmentItemMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AssessmentItemMarshallerTest.php
index 97ca2710b..00a168c95 100644
--- a/test/qtism/data/storage/xml/marshalling/AssessmentItemMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AssessmentItemMarshallerTest.php
@@ -6,11 +6,8 @@
 use qtism\data\state\OutcomeDeclaration;
 use qtism\common\enums\Cardinality;
 use qtism\common\enums\BaseType;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\AssessmentItem;
 
-use \DOMDocument;
-
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
 class AssessmentItemMarshallerTest extends QtiSmTestCase {
@@ -146,4 +143,4 @@ public function testUnmarshallMaximal() {
 		$outcomeDeclarations = $component->getOutcomeDeclarations();
 		$this->assertEquals(2, count($outcomeDeclarations));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AssessmentItemRefMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AssessmentItemRefMarshallerTest.php
index 60011dc58..a84e66b3d 100644
--- a/test/qtism/data/storage/xml/marshalling/AssessmentItemRefMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AssessmentItemRefMarshallerTest.php
@@ -2,7 +2,6 @@
 
 use qtism\common\datatypes\Duration;
 use qtism\common\enums\BaseType;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\AssessmentItemRef;
 use qtism\data\state\WeightCollection;
 use qtism\data\state\Weight;
@@ -18,7 +17,6 @@
 use qtism\data\TimeLimits;
 use qtism\data\ItemSessionControl;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -174,4 +172,4 @@ public function testUnmarshallMaximal() {
 		$this->assertInstanceOf('qtism\\data\\TimeLimits', $component->getTimeLimits());
 		$this->assertInstanceOf('qtism\\data\\ItemSessionControl', $component->getItemSessionControl());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AssessmentSectionMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AssessmentSectionMarshallerTest.php
index 8785be59f..ddadbb5bf 100644
--- a/test/qtism/data/storage/xml/marshalling/AssessmentSectionMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AssessmentSectionMarshallerTest.php
@@ -4,7 +4,6 @@
 use qtism\data\AssessmentItemRef;
 use qtism\data\SectionPartCollection;
 use qtism\data\ItemSessionControl;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\AssessmentSection;
 use qtism\data\rules\PreCondition;
 use qtism\data\rules\PreConditionCollection;
@@ -12,7 +11,6 @@
 use qtism\data\rules\BranchRuleCollection;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -314,4 +312,4 @@ public function testUnmarshallOneSectionAssessmentItemRefOnly() {
 		$assessmentItemRefs = $component->getSectionParts();
 		$this->assertEquals(3, count($assessmentItemRefs));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AssessmentSectionRefMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AssessmentSectionRefMarshallerTest.php
index a25499b8c..a9114ad09 100644
--- a/test/qtism/data/storage/xml/marshalling/AssessmentSectionRefMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AssessmentSectionRefMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\AssessmentSectionRef;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -34,4 +32,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getIdentifier(), 'mySectionRef');
 		$this->assertEquals($component->getHref(), 'http://www.rdfabout.com');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/AssessmentTestMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/AssessmentTestMarshallerTest.php
index c98d5fbd0..e9342e72e 100644
--- a/test/qtism/data/storage/xml/marshalling/AssessmentTestMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/AssessmentTestMarshallerTest.php
@@ -13,9 +13,7 @@
 use qtism\data\TestPart;
 use qtism\data\AssessmentSectionCollection;
 use qtism\data\AssessmentSection;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\AssessmentTest;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -119,4 +117,4 @@ public function testUnmarshall() {
 		$this->assertEquals(1, count($component->getOutcomeDeclarations()));
 		$this->assertEquals(1, count($component->getOutcomeProcessing()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/BaseValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/BaseValueMarshallerTest.php
index 052ae0b7d..8ecb635e5 100644
--- a/test/qtism/data/storage/xml/marshalling/BaseValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/BaseValueMarshallerTest.php
@@ -1,10 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use qtism\data\storage\Utils;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +43,4 @@ public function testUnmarshallCDATA() {
 	    $this->assertEquals($component->getBaseType(), BaseType::STRING);
 	    $this->assertEquals('A string...', $component->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/BlockquoteMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/BlockquoteMarshallerTest.php
index d05b3b9b2..c4ffb811e 100644
--- a/test/qtism/data/storage/xml/marshalling/BlockquoteMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/BlockquoteMarshallerTest.php
@@ -7,7 +7,6 @@
 use qtism\data\content\TextRun;
 use qtism\data\content\FlowCollection;
 use qtism\data\content\xhtml\text\Div;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -60,4 +59,4 @@ public function testMarshall() {
 	    
 	    $this->assertEquals('<blockquote class="physics"><h4>Albert Einstein</h4><div class="description">An old Physicist.</div></blockquote>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/BranchRuleMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/BranchRuleMarshallerTest.php
index fec39d284..8e18e1e8f 100644
--- a/test/qtism/data/storage/xml/marshalling/BranchRuleMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/BranchRuleMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\BranchRule;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -41,4 +39,4 @@ public function testUnmarshall() {
 		$this->assertEquals('target1', $component->getTarget());
 		$this->assertInstanceOf('qtism\\data\\expressions\\BaseValue', $component->getExpression());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/CorrectMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/CorrectMarshallerTest.php
index e98bd0459..951156066 100644
--- a/test/qtism/data/storage/xml/marshalling/CorrectMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/CorrectMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\Correct;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -31,4 +29,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\Correct', $component);
 		$this->assertEquals($component->getIdentifier(), 'myCorrect1');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/CorrectResponseMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/CorrectResponseMarshallerTest.php
index 62c9425f9..6701377e8 100644
--- a/test/qtism/data/storage/xml/marshalling/CorrectResponseMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/CorrectResponseMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\CorrectResponse;
 use qtism\data\state\Value;
 use qtism\data\state\ValueCollection;
 use qtism\common\enums\BaseType;
 use qtism\common\datatypes\Pair;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -83,4 +81,4 @@ public function testUnmarshallTwo() {
 			$this->assertFalse($value->isPartOfRecord());
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/CustomOperatorMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/CustomOperatorMarshallerTest.php
index 74fdaa7cb..fe36f6040 100644
--- a/test/qtism/data/storage/xml/marshalling/CustomOperatorMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/CustomOperatorMarshallerTest.php
@@ -6,7 +6,6 @@
 use qtism\common\enums\BaseType;
 use qtism\data\expressions\BaseValue;
 use qtism\data\expressions\operators\CustomOperator;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -45,4 +44,4 @@ public function testUnmarshall() {
  		$this->assertEquals(BaseType::INTEGER, $subExpressions[1]->getBaseType());
  		$this->assertEquals(1, $subExpressions[1]->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/DefaultValMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/DefaultValMarshallerTest.php
index 20fd3658d..0ab065183 100644
--- a/test/qtism/data/storage/xml/marshalling/DefaultValMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/DefaultValMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\DefaultVal;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -31,4 +29,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\DefaultVal', $component);
 		$this->assertEquals($component->getIdentifier(), 'myDefault1');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/DefaultValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/DefaultValueMarshallerTest.php
index 4b09c6e52..9c2a888c3 100644
--- a/test/qtism/data/storage/xml/marshalling/DefaultValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/DefaultValueMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\DefaultValue;
 use qtism\data\state\Value;
 use qtism\data\state\ValueCollection;
 use qtism\common\enums\BaseType;
 use qtism\common\datatypes\Pair;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -130,4 +128,4 @@ public function testUnmarshallThree() {
 	    $this->assertEquals(BaseType::IDENTIFIER, $valuesCollection[3]->getBaseType());
 	    $this->assertFalse($valuesCollection[3]->hasFieldIdentifier());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/DivMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/DivMarshallerTest.php
index d4242d13b..602e14503 100644
--- a/test/qtism/data/storage/xml/marshalling/DivMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/DivMarshallerTest.php
@@ -10,7 +10,6 @@
 use qtism\data\content\xhtml\lists\Ul;
 use qtism\data\content\FlowCollection;
 use qtism\data\content\xhtml\lists\Li;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -154,4 +153,4 @@ public function testMarshall() {
         $expected = '<div id="main-container" class="ui-pane"><div id="menu"><ul><li>Start the Game</li><li>Configure Inputs</li><li>Hall of Fame</li><li>Quit</li></ul></div><div id="content"><h1>Escape from Death Star</h1><p class="short-story">An <strong>incredible</strong> adventure.</p></div></div>';
         $this->assertEquals($expected, $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/DlMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/DlMarshallerTest.php
index d15e5d514..34e163680 100644
--- a/test/qtism/data/storage/xml/marshalling/DlMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/DlMarshallerTest.php
@@ -7,7 +7,6 @@
 use qtism\data\content\TextRun;
 use qtism\data\content\InlineCollection;
 use qtism\data\content\xhtml\lists\Dt;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -79,4 +78,4 @@ public function testMarshall() {
         
         $this->assertEquals('<dl id="my-description-list"><dt>Cola</dt><dd class="soda">Black sparkling soda.</dd><dt class="beverage">Tea</dt><dd>Hot water with something</dd></dl>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/EqualMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/EqualMarshallerTest.php
index 2ceb6a45d..8704c9de2 100644
--- a/test/qtism/data/storage/xml/marshalling/EqualMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/EqualMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\Equal;
 use qtism\data\expressions\operators\ToleranceMode;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -59,4 +57,4 @@ public function testUnmarshall() {
 		$this->assertTrue($component->doesIncludeUpperBound());
 		$this->assertEquals(2, count($component->getExpressions()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/EqualRoundedMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/EqualRoundedMarshallerTest.php
index 5b362cba6..770c23dc7 100644
--- a/test/qtism/data/storage/xml/marshalling/EqualRoundedMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/EqualRoundedMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\EqualRounded;
 use qtism\data\expressions\operators\RoundingMode;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -53,4 +51,4 @@ public function testUnmarshall() {
 		$this->assertEquals(RoundingMode::SIGNIFICANT_FIGURES, $component->getRoundingMode());
 		$this->assertEquals(2, count($component->getExpressions()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ExitResponseMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ExitResponseMarshallerTest.php
index 7e803a467..76692ab4d 100644
--- a/test/qtism/data/storage/xml/marshalling/ExitResponseMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ExitResponseMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\ExitResponse;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -29,4 +27,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\rules\\ExitResponse', $component);
 		$this->assertEquals('exitResponse', $component->getQtiClassName());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ExitTestMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ExitTestMarshallerTest.php
index aad62503b..3b47740c8 100644
--- a/test/qtism/data/storage/xml/marshalling/ExitTestMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ExitTestMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\ExitTest;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -29,4 +27,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\rules\\ExitTest', $component);
 		$this->assertEquals('exitTest', $component->getQtiClassName());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/FieldValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/FieldValueMarshallerTest.php
index 05606116f..bf6e2e181 100644
--- a/test/qtism/data/storage/xml/marshalling/FieldValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/FieldValueMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\FieldValue;
 use qtism\data\expressions\Variable;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -48,4 +46,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\Variable', $sub1);
 		$this->assertEquals('recordVar', $sub1->getIdentifier());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/IndexMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/IndexMarshallerTest.php
index cd60779d0..98b90fd2b 100644
--- a/test/qtism/data/storage/xml/marshalling/IndexMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/IndexMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\Index;
 use qtism\data\expressions\Variable;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +44,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\Variable', $sub1);
 		$this->assertEquals('orderedVar', $sub1->getIdentifier());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/InfoControlMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/InfoControlMarshallerTest.php
index 505afbfeb..24b634241 100644
--- a/test/qtism/data/storage/xml/marshalling/InfoControlMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/InfoControlMarshallerTest.php
@@ -5,8 +5,6 @@
 use qtism\data\content\InlineCollection;
 use qtism\data\content\xhtml\text\Em;
 use qtism\data\content\InfoControl;
-use qtism\data\storage\xml\marshalling\Marshaller;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -102,4 +100,4 @@ public function testMarshallComplex() {
         
         $this->assertEquals('<infoControl id="controlMePlease">This is <em>gooood</em> !</infoControl>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/InsideMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/InsideMarshallerTest.php
index 07fcc2a35..5cf47bdba 100644
--- a/test/qtism/data/storage/xml/marshalling/InsideMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/InsideMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\Inside;
 use qtism\common\datatypes\Shape;
 use qtism\common\datatypes\Coords;
 use qtism\data\expressions\Variable;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -51,4 +49,4 @@ public function testUnmarshall() {
 		$this->assertEquals(Shape::RECT, $component->getShape());
 		$this->assertEquals(1, count($component->getExpressions()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/InterpolationTableEntryMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/InterpolationTableEntryMarshallerTest.php
index 0a4fa0bb3..3970ab3c5 100644
--- a/test/qtism/data/storage/xml/marshalling/InterpolationTableEntryMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/InterpolationTableEntryMarshallerTest.php
@@ -1,10 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\InterpolationTableEntry;
-use qtism\data\state\Value;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +39,4 @@ public function testUnmarshall() {
 		$this->assertInternalType('integer', $component->getTargetValue());
 		$this->assertEquals(1, $component->getTargetValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/InterpolationTableMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/InterpolationTableMarshallerTest.php
index 196b34200..9bd2bf0f4 100644
--- a/test/qtism/data/storage/xml/marshalling/InterpolationTableMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/InterpolationTableMarshallerTest.php
@@ -1,12 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\InterpolationTable;
 use qtism\data\state\InterpolationTableEntry;
 use qtism\data\state\InterpolationTableEntryCollection;
-use qtism\data\state\Value;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -69,4 +66,4 @@ public function testUnmarshall() {
 		$this->assertEquals(false, $entry->getTargetValue());
 		$this->assertEquals(true, $entry->doesIncludeBoundary());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ItemBodyMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ItemBodyMarshallerTest.php
index 6757d2b86..b1bd050c3 100644
--- a/test/qtism/data/storage/xml/marshalling/ItemBodyMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ItemBodyMarshallerTest.php
@@ -7,7 +7,6 @@
 use qtism\data\content\xhtml\text\Div;
 use qtism\data\content\InlineCollection;
 use qtism\data\content\xhtml\text\H1;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -57,4 +56,4 @@ public function testMarshall() {
 	    $element = $dom->importNode($element, true);
 	    $this->assertEquals('<itemBody id="my-body"><h1>Super Item</h1><div>This is some stimulus.</div></itemBody>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ItemSessionControlMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ItemSessionControlMarshallerTest.php
index 345a04c06..3970b8563 100644
--- a/test/qtism/data/storage/xml/marshalling/ItemSessionControlMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ItemSessionControlMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\ItemSessionControl;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -44,4 +42,4 @@ public function testUnmarshall() {
 		$this->assertTrue($component->doesAllowComment());
 		$this->assertFalse($component->doesAllowSkipping());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ItemSubsetMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ItemSubsetMarshallerTest.php
index e10e7c178..86ab3168b 100644
--- a/test/qtism/data/storage/xml/marshalling/ItemSubsetMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ItemSubsetMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ItemSubset;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -98,4 +96,4 @@ public function testUnmarshallIncludeExcludeCategories() {
 		$this->assertEquals(implode("\x20", $component->getIncludeCategories()->getArrayCopy()), 'cat1 cat2');
 		$this->assertEquals(implode("\x20", $component->getExcludeCategories()->getArrayCopy()), 'cat3');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ListMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ListMarshallerTest.php
index 49a159f8e..575ea700e 100644
--- a/test/qtism/data/storage/xml/marshalling/ListMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ListMarshallerTest.php
@@ -10,7 +10,6 @@
 use qtism\data\content\TextRun;
 use qtism\data\content\FlowCollection;
 use qtism\data\content\xhtml\lists\Li;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -108,4 +107,4 @@ public function testMarshallUl() {
 	    
 	    $this->assertEquals('<ul class="my-qti-list"><li>Simple <strong>text</strong>.</li><li>olé <ol id="ordered-list"><li>Some super <em>text</em>:<p>Some complex text.</p></li></ol></li></ul>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/LookupOutcomeValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/LookupOutcomeValueMarshallerTest.php
index 51e0402f1..2d2597b0b 100644
--- a/test/qtism/data/storage/xml/marshalling/LookupOutcomeValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/LookupOutcomeValueMarshallerTest.php
@@ -2,10 +2,8 @@
 
 use qtism\data\rules\LookupOutcomeValue;
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +44,4 @@ public function testUnmarshall() {
 		$this->assertEquals('a value', $component->getExpression()->getValue());
 		$this->assertEquals(BaseType::STRING, $component->getExpression()->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MapEntryMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MapEntryMarshallerTest.php
index 0d30b5024..c87883a7e 100644
--- a/test/qtism/data/storage/xml/marshalling/MapEntryMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MapEntryMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\MapEntry;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -39,4 +37,4 @@ public function testUnmarshall() {
 		$this->assertInternalType('boolean', $component->isCaseSensitive());
 		$this->assertEquals(true, $component->isCaseSensitive());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MapResponseMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MapResponseMarshallerTest.php
index ca4cd0077..f26acbda9 100644
--- a/test/qtism/data/storage/xml/marshalling/MapResponseMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MapResponseMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\MapResponse;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -32,4 +30,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\MapResponse', $component);
 		$this->assertEquals($component->getIdentifier(), 'myMapResponse1');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MapResponsePointMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MapResponsePointMarshallerTest.php
index 73399b7c6..92020264d 100644
--- a/test/qtism/data/storage/xml/marshalling/MapResponsePointMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MapResponsePointMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\MapResponsePoint;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -32,4 +30,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\MapResponsePoint', $component);
 		$this->assertEquals($component->getIdentifier(), 'myMapResponsePoint1');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MappingMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MappingMarshallerTest.php
index ca575c65b..5b761d851 100644
--- a/test/qtism/data/storage/xml/marshalling/MappingMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MappingMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
 use qtism\data\state\MapEntryCollection;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\Mapping;
 use qtism\data\state\MapEntry;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -62,4 +60,4 @@ public function testUnmarshallMinimal() {
 		$this->assertEquals(1.337, $mapEntries[0]->getMappedValue());
 		$this->assertFalse($mapEntries[0]->isCaseSensitive());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MarshallerTest.php
index b5b544890..d1c137e27 100644
--- a/test/qtism/data/storage/xml/marshalling/MarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MarshallerTest.php
@@ -2,7 +2,6 @@
 
 use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\ItemSessionControl;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -126,4 +125,4 @@ public function testSetXmlBase() {
 	    $this->assertEquals('http://my-new-base.com', Marshaller::getXmlBase($bar));
 	    $this->assertFalse(Marshaller::getXmlBase($baz));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MatchTableEntryMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MatchTableEntryMarshallerTest.php
index 3d634008c..4c692863d 100644
--- a/test/qtism/data/storage/xml/marshalling/MatchTableEntryMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MatchTableEntryMarshallerTest.php
@@ -1,12 +1,7 @@
 <?php
 
-use qtism\data\expressions\BaseValue;
-use qtism\data\storage\xml\marshalling\Marshaller;
-use qtism\data\storage\Utils;
 use qtism\data\state\MatchTableEntry;
 use qtism\common\enums\BaseType;
-use qtism\data\state\Value;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -39,4 +34,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getSourceValue(), 2);
 		$this->assertEquals($component->getTargetValue(), 'http://www.mysite.com');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MatchTableMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MatchTableMarshallerTest.php
index 045667e90..74af81a14 100644
--- a/test/qtism/data/storage/xml/marshalling/MatchTableMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MatchTableMarshallerTest.php
@@ -1,13 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\MatchTable;
 use qtism\data\state\MatchTableEntry;
 use qtism\data\state\MatchTableEntryCollection;
 use qtism\common\enums\BaseType;
-use qtism\data\state\Value;
 use qtism\common\datatypes\Pair;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -57,4 +54,4 @@ public function testUnmarshall() {
 		$this->assertEquals(1, $entry->getSourceValue());
 		$this->assertInstanceOf('qtism\\common\\datatypes\\DirectedPair', $entry->getTargetValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MathConstantMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MathConstantMarshallerTest.php
index 2ade358e5..71937d4bc 100644
--- a/test/qtism/data/storage/xml/marshalling/MathConstantMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MathConstantMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\MathConstant;
 use qtism\data\expressions\MathEnumeration;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -33,4 +31,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\expressions\\MathConstant', $component);
 		$this->assertEquals($component->getName(), MathEnumeration::PI);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/MathOperatorMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/MathOperatorMarshallerTest.php
index 2831ae580..cf5631de2 100644
--- a/test/qtism/data/storage/xml/marshalling/MathOperatorMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/MathOperatorMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\MathOperator;
 use qtism\data\expressions\operators\MathFunctions;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -54,4 +52,4 @@ public function testUnmarshall() {
 		$this->assertEquals(1.57, $subExpr[0]->getValue());
 		$this->assertEquals(BaseType::FLOAT, $subExpr[0]->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NullValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NullValueMarshallerTest.php
index 819ed8afe..9c4346225 100644
--- a/test/qtism/data/storage/xml/marshalling/NullValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NullValueMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NullValue;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -28,4 +26,4 @@ public function testUnmarshall() {
 		
 		$this->assertInstanceOf('qtism\\data\\expressions\\NullValue', $component);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NumberCorrectMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NumberCorrectMarshallerTest.php
index 5495ac269..08d60c99c 100644
--- a/test/qtism/data/storage/xml/marshalling/NumberCorrectMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NumberCorrectMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NumberCorrect;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NumberIncorrectMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NumberIncorrectMarshallerTest.php
index 8fa30de23..292ebdf33 100644
--- a/test/qtism/data/storage/xml/marshalling/NumberIncorrectMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NumberIncorrectMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NumberIncorrect;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NumberPresentedMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NumberPresentedMarshallerTest.php
index 692fa21f2..015f19443 100644
--- a/test/qtism/data/storage/xml/marshalling/NumberPresentedMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NumberPresentedMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NumberPresented;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NumberRespondedMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NumberRespondedMarshallerTest.php
index 12833fd37..3411dc63b 100644
--- a/test/qtism/data/storage/xml/marshalling/NumberRespondedMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NumberRespondedMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NumberResponded;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/NumberSelectedMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/NumberSelectedMarshallerTest.php
index 72f4ccef7..3926f3645 100644
--- a/test/qtism/data/storage/xml/marshalling/NumberSelectedMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/NumberSelectedMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\NumberSelected;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ObjectMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ObjectMarshallerTest.php
index f69daf763..2fa0a2439 100644
--- a/test/qtism/data/storage/xml/marshalling/ObjectMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ObjectMarshallerTest.php
@@ -4,7 +4,6 @@
 use qtism\data\content\xhtml\Object;
 use qtism\data\content\xhtml\Param;
 use qtism\data\content\xhtml\ParamType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -71,4 +70,4 @@ public function testMarshallNoDataAttributeValue() {
 	    
 	    $this->assertEquals('<object data="" type="application/x-shockwave-flash" id="flash-movie"/>', $dom->saveXml($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OperatorMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OperatorMarshallerTest.php
index b032a831b..51ceab803 100644
--- a/test/qtism/data/storage/xml/marshalling/OperatorMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OperatorMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\operators\Sum;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -92,4 +90,4 @@ public function testMarshall() {
 		$this->assertEquals('3', $baseValues->item(0)->nodeValue);
 		$this->assertEquals('4', $baseValues->item(1)->nodeValue);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OrderingMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OrderingMarshallerTest.php
index a7d7613e5..4337ba43b 100644
--- a/test/qtism/data/storage/xml/marshalling/OrderingMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OrderingMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\Ordering;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -31,4 +29,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\Rules\\Ordering', $component);
 		$this->assertEquals($component->getShuffle(), false);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeConditionMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeConditionMarshallerTest.php
index bd7869ee8..6e8fdaf8e 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeConditionMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeConditionMarshallerTest.php
@@ -3,11 +3,9 @@
 use qtism\data\rules\OutcomeRuleCollection;
 use qtism\data\rules\OutcomeIf;
 use qtism\data\rules\OutcomeCondition;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\common\enums\BaseType;
 use qtism\data\expressions\BaseValue;
 use qtism\data\rules\SetOutcomeValue;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -331,4 +329,4 @@ public function testUnmarshallConditionUltimate() { // Special thanks to Younes
 		$this->assertInstanceOf('qtism\\data\\rules\\SetOutcomeValue', $outcomeRules[0]);
 		$this->assertEquals('Else!', $outcomeRules[0]->getExpression()->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeControlMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeControlMarshallerTest.php
index 9f546f802..d63a0694e 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeControlMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeControlMarshallerTest.php
@@ -3,12 +3,10 @@
 use qtism\data\rules\OutcomeIf;
 use qtism\data\rules\OutcomeElseIf;
 use qtism\data\rules\OutcomeElse;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\common\enums\BaseType;
 use qtism\data\expressions\BaseValue;
 use qtism\data\rules\SetOutcomeValue;
 use qtism\data\rules\OutcomeRuleCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -175,4 +173,4 @@ public function testUnmarshallElseMinimal() {
 		$this->assertEquals('Tested!', $outcomeRules[0]->getExpression()->getValue());
 		$this->assertEquals(BaseType::STRING, $outcomeRules[0]->getExpression()->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeDeclarationMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeDeclarationMarshallerTest.php
index d218b0a7f..26e0a60eb 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeDeclarationMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeDeclarationMarshallerTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use qtism\common\datatypes\Duration;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\OutcomeDeclaration;
 use qtism\common\enums\Cardinality;
 use qtism\common\enums\BaseType;
@@ -11,7 +10,6 @@
 use qtism\data\state\MatchTable;
 use qtism\data\state\MatchTableEntry;
 use qtism\data\state\MatchTableEntryCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -254,4 +252,4 @@ public function testUnmarshallMatchTable() {
 		$this->assertInternalType('float', $entries[0]->getTargetValue());
 		$this->assertEquals(2.5, $entries[1]->getTargetValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeMaximumMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeMaximumMarshallerTest.php
index 6ebd06a63..afcb03ee7 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeMaximumMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeMaximumMarshallerTest.php
@@ -1,10 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\OutcomeMaximum;
-use qtism\common\enums\BaseType;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -49,4 +46,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeMinimumMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeMinimumMarshallerTest.php
index 462bf1201..b3288c32b 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeMinimumMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeMinimumMarshallerTest.php
@@ -1,10 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\OutcomeMinimum;
-use qtism\common\enums\BaseType;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -49,4 +46,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat1', implode("\x20", $component->getIncludeCategories()->getArrayCopy()));
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/OutcomeProcessingMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/OutcomeProcessingMarshallerTest.php
index 855ef0211..19fe1128a 100644
--- a/test/qtism/data/storage/xml/marshalling/OutcomeProcessingMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/OutcomeProcessingMarshallerTest.php
@@ -6,8 +6,6 @@
 use qtism\data\rules\LookupOutcomeValue;
 use qtism\data\rules\OutcomeRuleCollection;
 use qtism\data\processing\OutcomeProcessing;
-use qtism\data\storage\xml\marshalling\Marshaller;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -69,4 +67,4 @@ public function testUnmarshall() {
 		$this->assertInternalType('boolean', $outcomeRules[1]->getExpression()->getValue());
 		$this->assertTrue($outcomeRules[1]->getExpression()->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/PatternMatchMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/PatternMatchMarshallerTest.php
index 104e54ed1..716727376 100644
--- a/test/qtism/data/storage/xml/marshalling/PatternMatchMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/PatternMatchMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\PatternMatch;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +44,4 @@ public function testUnmarshall() {
 		$this->assertEquals('^Hello World$', $component->getPattern());
 		$this->assertEquals(1, count($component->getExpressions()));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/PreConditionMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/PreConditionMarshallerTest.php
index 202011a87..3f4c373c8 100644
--- a/test/qtism/data/storage/xml/marshalling/PreConditionMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/PreConditionMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\PreCondition;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -38,4 +36,4 @@ public function testUnmarshall() {
 		$this->assertInstanceOf('qtism\\data\\rules\\PreCondition', $component);
 		$this->assertInstanceOf('qtism\\data\\expressions\\BaseValue', $component->getExpression());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/RandomFloatMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/RandomFloatMarshallerTest.php
index 350dab2e6..39beaf1f7 100644
--- a/test/qtism/data/storage/xml/marshalling/RandomFloatMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/RandomFloatMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\RandomFloat;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -29,4 +27,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getMin(), 1.3);
 		$this->assertEquals($component->getMax(), '{tplVariable1}');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/RandomIntegerMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/RandomIntegerMarshallerTest.php
index 1669cceef..30f972434 100644
--- a/test/qtism/data/storage/xml/marshalling/RandomIntegerMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/RandomIntegerMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\RandomInteger;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -36,4 +34,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getMax(), '{tplVariable1}');
 		$this->assertEquals($component->getStep(), 2);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/RepeatMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/RepeatMarshallerTest.php
index 1fef041a1..a91838d41 100644
--- a/test/qtism/data/storage/xml/marshalling/RepeatMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/RepeatMarshallerTest.php
@@ -1,13 +1,11 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\Repeat;
 use qtism\data\expressions\BaseValue;
 use qtism\data\expressions\operators\MathOperator;
 use qtism\data\expressions\operators\MathFunctions;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -85,4 +83,4 @@ public function testUnmarshall() {
 		$this->assertEquals(1.68, $sub21->getValue());
 		$this->assertEquals(BaseType::FLOAT, $sub21->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ResponseDeclarationMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ResponseDeclarationMarshallerTest.php
index 4cddc20d9..8f28243f8 100644
--- a/test/qtism/data/storage/xml/marshalling/ResponseDeclarationMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ResponseDeclarationMarshallerTest.php
@@ -4,14 +4,11 @@
 use qtism\data\state\MapEntry;
 use qtism\data\state\Mapping;
 use qtism\data\state\CorrectResponse;
-use qtism\common\datatypes\Duration;
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\ResponseDeclaration;
 use qtism\common\enums\Cardinality;
 use qtism\common\enums\BaseType;
 use qtism\data\state\Value;
 use qtism\data\state\ValueCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -201,4 +198,4 @@ public function testUnmarshallMatchTable() {
 		$this->assertInternalType('float', $entries[0]->getTargetValue());
 		$this->assertEquals(2.5, $entries[1]->getTargetValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/RoundToMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/RoundToMarshallerTest.php
index c9fa47cc3..2aa806bf3 100644
--- a/test/qtism/data/storage/xml/marshalling/RoundToMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/RoundToMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\RoundTo;
 use qtism\data\expressions\operators\RoundingMode;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -54,4 +52,4 @@ public function testUnmarshall() {
 		$this->assertEquals(24.3333, $subExpr[0]->getValue());
 		$this->assertEquals(BaseType::FLOAT, $subExpr[0]->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/RubricBlockMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/RubricBlockMarshallerTest.php
index a879e8db0..2ba36381e 100644
--- a/test/qtism/data/storage/xml/marshalling/RubricBlockMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/RubricBlockMarshallerTest.php
@@ -10,7 +10,6 @@
 use qtism\data\content\InlineCollection;
 use qtism\data\content\xhtml\text\H3;
 use qtism\data\content\Stylesheet;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -64,4 +63,4 @@ public function testMarshall() {
 	    
 	    $this->assertEquals('<rubricBlock view="candidate tutor" class="warning"><h3>Be carefull kiddo!</h3><p>Read the instructions twice.</p><stylesheet href="./stylesheet.css" media="screen" type="text/css"/></rubricBlock>', $dom->saveXML($element));
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/SectionPartMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/SectionPartMarshallerTest.php
index 0be610fc6..e87b07d57 100644
--- a/test/qtism/data/storage/xml/marshalling/SectionPartMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/SectionPartMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\SectionPart;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -34,4 +32,4 @@ public function testUnmarshall() {
 		$this->assertFalse($component->isFixed());
 		$this->assertFalse($component->isRequired());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/SelectionMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/SelectionMarshallerTest.php
index 06637a5ae..57dcf9d98 100644
--- a/test/qtism/data/storage/xml/marshalling/SelectionMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/SelectionMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\Selection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -49,4 +47,4 @@ public function testUnmarshallInvalid() {
 		$this->setExpectedException('qtism\\data\\storage\\xml\\marshalling\\UnmarshallingException');
 		$component = $marshaller->unmarshall($element);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/SetOutcomeValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/SetOutcomeValueMarshallerTest.php
index 1c9c901ce..0deb92866 100644
--- a/test/qtism/data/storage/xml/marshalling/SetOutcomeValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/SetOutcomeValueMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\rules\SetOutcomeValue;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -42,4 +40,4 @@ public function testUnmarshall() {
 		$this->assertEquals('variable1', $component->getIdentifier());
 		$this->assertInstanceOf('qtism\\data\\expressions\\BaseValue', $component->getExpression());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/SimpleInlineMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/SimpleInlineMarshallerTest.php
index f55d07a17..efe4db777 100644
--- a/test/qtism/data/storage/xml/marshalling/SimpleInlineMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/SimpleInlineMarshallerTest.php
@@ -6,7 +6,6 @@
 use qtism\data\content\TextRun;
 use qtism\data\content\InlineCollection;
 use qtism\data\content\xhtml\text\Strong;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -78,4 +77,4 @@ public function testUnmarshallQandA() {
 	    $this->assertInstanceOf('qtism\\data\\content\\xhtml\\text\\Q', $q);
 	    
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/StatsOperatorMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/StatsOperatorMarshallerTest.php
index a9fd3ff99..a91136fe4 100644
--- a/test/qtism/data/storage/xml/marshalling/StatsOperatorMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/StatsOperatorMarshallerTest.php
@@ -1,12 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\StatsOperator;
 use qtism\data\expressions\operators\Statistics;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -54,4 +52,4 @@ public function testUnmarshall() {
 		$this->assertEquals(12.5468, $subExpr[0]->getValue());
 		$this->assertEquals(BaseType::FLOAT, $subExpr[0]->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/StringMatchMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/StringMatchMarshallerTest.php
index 8773b7873..b9a87462f 100644
--- a/test/qtism/data/storage/xml/marshalling/StringMatchMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/StringMatchMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\StringMatch;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -49,4 +47,4 @@ public function testUnmarshall() {
 		$this->assertInternalType('boolean', $component->mustSubstring());
 		$this->assertFalse($component->mustSubstring());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/StylesheetMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/StylesheetMarshallerTest.php
index 943e6c032..70c412008 100644
--- a/test/qtism/data/storage/xml/marshalling/StylesheetMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/StylesheetMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\content\Stylesheet;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -62,4 +60,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getMedia(), 'screen');
 		$this->assertEquals($component->getType(), 'text/css');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/SubstringMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/SubstringMarshallerTest.php
index 4bd2ab998..7640fd5fe 100644
--- a/test/qtism/data/storage/xml/marshalling/SubstringMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/SubstringMarshallerTest.php
@@ -1,11 +1,9 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\ExpressionCollection;
 use qtism\data\expressions\operators\Substring;
 use qtism\data\expressions\BaseValue;
 use qtism\common\enums\BaseType;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -61,4 +59,4 @@ public function testUnmarshall() {
 		$this->assertEquals(BaseType::STRING, $sub->getBaseType());
 		$this->assertEquals('Shell', $sub->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TableMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TableMarshallerTest.php
index d42593aa2..a5adc0870 100644
--- a/test/qtism/data/storage/xml/marshalling/TableMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TableMarshallerTest.php
@@ -19,7 +19,6 @@
 use qtism\data\content\xhtml\tables\Tr;
 use qtism\data\content\xhtml\tables\TrCollection;
 use qtism\data\content\xhtml\tables\TableCellScope;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -193,4 +192,4 @@ public function testUnmarshall() {
 	    $this->assertEquals(1, $cols[0]->getSpan());
 	    $this->assertEquals(1, $cols[1]->getspan());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TemplateDefaultMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TemplateDefaultMarshallerTest.php
index a29c9c9c0..89cae598b 100644
--- a/test/qtism/data/storage/xml/marshalling/TemplateDefaultMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TemplateDefaultMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\TemplateDefault;
 use qtism\data\expressions\NullValue;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -46,4 +44,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getTemplateIdentifier(), 'myTemplate1');
 		$this->assertInstanceOf('qtism\\data\\expressions\\NullValue', $component->getExpression());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TestFeedbackMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TestFeedbackMarshallerTest.php
index 979af6a24..71385380a 100644
--- a/test/qtism/data/storage/xml/marshalling/TestFeedbackMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TestFeedbackMarshallerTest.php
@@ -1,13 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\TestFeedbackMarshaller;
-
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\TestFeedback;
 use qtism\data\TestFeedbackAccess;
 use qtism\data\ShowHide;
-use \ReflectionClass;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -77,4 +72,4 @@ public function feedbackContent() {
 			array('<testFeedback xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1" access="during" identifier="myId1" outcomeIdentifier="myId2" showHide="show"><div><p>Hello there!</p></div></testFeedback>', '<div><p>Hello there!</p></div>')		
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TestPartMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TestPartMarshallerTest.php
index 7e1f611aa..c2961a41a 100644
--- a/test/qtism/data/storage/xml/marshalling/TestPartMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TestPartMarshallerTest.php
@@ -1,14 +1,10 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\TestPart;
 use qtism\data\AssessmentSection;
 use qtism\data\AssessmentSectionCollection;
-use qtism\data\TestFeedback;
-use qtism\data\TestFeedbackCollection;
 use qtism\data\NavigationMode;
 use qtism\data\SubmissionMode;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -131,4 +127,4 @@ public function testUnmarshallMorderate() {
 		$this->assertEquals(0, $component->getItemSessionControl()->getMaxAttempts());
 		$this->assertTrue($component->hasTimeLimits());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TestVariablesMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TestVariablesMarshallerTest.php
index fd858f5a0..679c023db 100644
--- a/test/qtism/data/storage/xml/marshalling/TestVariablesMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TestVariablesMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\TestVariables;
 use qtism\common\enums\BaseType;
 use qtism\common\collections\IdentifierCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -52,4 +50,4 @@ public function testUnmarshall() {
 		$this->assertEquals('cat2 cat3', implode("\x20", $component->getExcludeCategories()->getArrayCopy()));
 		$this->assertEquals(BaseType::INTEGER, $component->getBaseType());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/TimeLimitsMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/TimeLimitsMarshallerTest.php
index 56311c55c..18379ea46 100644
--- a/test/qtism/data/storage/xml/marshalling/TimeLimitsMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/TimeLimitsMarshallerTest.php
@@ -1,9 +1,7 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\TimeLimits;
 use qtism\common\datatypes\Duration;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -51,4 +49,4 @@ public function testUnmarshallZero() {
 	    
 	    $this->assertInstanceOf('qtism\\data\\TimeLimits', $component);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/ValueMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/ValueMarshallerTest.php
index c10d9c2f3..bcdda13d8 100644
--- a/test/qtism/data/storage/xml/marshalling/ValueMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/ValueMarshallerTest.php
@@ -1,10 +1,8 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\Value;
 use qtism\common\enums\BaseType;
 use qtism\common\datatypes\Pair;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -131,4 +129,4 @@ public function testUnmarshallBaseType() {
 		$this->assertEquals($component->getValue()->getSecond(), 'B');
 		$this->assertEquals($component->getFieldIdentifier(), 'fieldIdentifier1');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/VariableDeclarationMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/VariableDeclarationMarshallerTest.php
index fad5f4137..7b8ad82ff 100644
--- a/test/qtism/data/storage/xml/marshalling/VariableDeclarationMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/VariableDeclarationMarshallerTest.php
@@ -1,13 +1,11 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\VariableDeclaration;
 use qtism\common\enums\Cardinality;
 use qtism\common\enums\BaseType;
 use qtism\data\state\DefaultValue;
 use qtism\data\state\Value;
 use qtism\data\state\ValueCollection;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -60,4 +58,4 @@ public function testUnmarshall() {
 		$this->assertEquals(1, count($values));
 		$this->assertInternalType('integer', $values[0]->getValue());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/VariableMappingMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/VariableMappingMarshallerTest.php
index 46cec4ec3..1dbac28ad 100644
--- a/test/qtism/data/storage/xml/marshalling/VariableMappingMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/VariableMappingMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\VariableMapping;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -35,4 +33,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getSource(), 'myIdentifier1');
 		$this->assertEquals($component->getTarget(), 'myIdentifier2');
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/VariableMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/VariableMarshallerTest.php
index 4b9d072b2..519167255 100644
--- a/test/qtism/data/storage/xml/marshalling/VariableMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/VariableMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\expressions\Variable;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -62,4 +60,4 @@ public function testUnmarshallNoWeight() {
 		$this->assertEquals('myVariable1', $component->getIdentifier());
 		$this->assertEquals('', $component->getWeightIdentifier());
 	}
-}
\ No newline at end of file
+}
diff --git a/test/qtism/data/storage/xml/marshalling/WeightMarshallerTest.php b/test/qtism/data/storage/xml/marshalling/WeightMarshallerTest.php
index 48998f77b..d48ad2e98 100644
--- a/test/qtism/data/storage/xml/marshalling/WeightMarshallerTest.php
+++ b/test/qtism/data/storage/xml/marshalling/WeightMarshallerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-use qtism\data\storage\xml\marshalling\Marshaller;
 use qtism\data\state\Weight;
-use \DOMDocument;
 
 require_once (dirname(__FILE__) . '/../../../../../QtiSmTestCase.php');
 
@@ -35,4 +33,4 @@ public function testUnmarshall() {
 		$this->assertEquals($component->getIdentifier(), 'myWeight1');
 		$this->assertEquals($component->getValue(), 3.45);
 	}
-}
\ No newline at end of file
+}