diff --git a/src/Messages/Components/Source.php b/src/Messages/Components/Source.php
index 2282d0c..48a52e0 100644
--- a/src/Messages/Components/Source.php
+++ b/src/Messages/Components/Source.php
@@ -73,8 +73,8 @@ public function getAttributes()
     {
         $attributes = [
             'channel' => $this->getChannel(),
-            'dealine' => $this->getDeadline(),
-            'statusDealine' => $this->getDeadlineStatus(),
+            'deadline' => $this->getDeadline(),
+            'statusDeadline' => $this->getDeadlineStatus(),
             'marked' => $this->getConfidential(),
             'format' => $this->getFormat(),
             'legiswrite' => $this->getLegiswriteFormat(),
diff --git a/templates/components/contact.tpl.php b/templates/components/contact.tpl.php
index 2fda013..9db65e4 100644
--- a/templates/components/contact.tpl.php
+++ b/templates/components/contact.tpl.php
@@ -8,8 +8,8 @@
  */
 ?>
 <contacts <?= $this->attributes($component->getAttributes()) ?>>
-    <contactNickname><?= $component->getNickname() ?></contactNickname>
+    <contactNickname><![CDATA[<?= $component->getNickname() ?>]]></contactNickname>
     <?php if ($component->getEmail()) : ?>
-        <contactEmail><?= $component->getEmail() ?></contactEmail>
+        <contactEmail><![CDATA[<?= $component->getEmail() ?>]]></contactEmail>
     <?php endif ?>
 </contacts>
diff --git a/templates/components/reference-document.tpl.php b/templates/components/reference-document.tpl.php
index fb94c2b..676d380 100644
--- a/templates/components/reference-document.tpl.php
+++ b/templates/components/reference-document.tpl.php
@@ -10,13 +10,13 @@
 <documentReference <?= $this->attributes($component->getAttributes()) ?>>
     <documentReferenceName><![CDATA[<?= $component->getName() ?>]]></documentReferenceName>
     <?php if ($component->getPath()) : ?>
-        <documentReferencePath><?= $component->getPath() ?></documentReferencePath>
+        <documentReferencePath><![CDATA[<?= $component->getPath() ?>]]></documentReferencePath>
     <?php endif ?>
     <?php if ($component->getSize()) : ?>
-        <documentReferenceSize><?= $component->getSize() ?></documentReferenceSize>
+        <documentReferenceSize><![CDATA[<?= $component->getSize() ?>]]></documentReferenceSize>
     <?php endif ?>
     <?php if ($component->getRemark()) : ?>
         <documentReferenceRemark><![CDATA[<?= $component->getRemark() ?>]]></documentReferenceRemark>
     <?php endif ?>
-    <documentReferenceFile><?= $component->getFile() ?></documentReferenceFile>
+    <documentReferenceFile><![CDATA[<?= $component->getFile() ?>]]></documentReferenceFile>
 </documentReference>
diff --git a/templates/components/return-address.tpl.php b/templates/components/return-address.tpl.php
index 93f2537..07d7ff2 100644
--- a/templates/components/return-address.tpl.php
+++ b/templates/components/return-address.tpl.php
@@ -22,3 +22,8 @@
         <retourRemark><![CDATA[<?= $component->getRemark() ?>]]></retourRemark>
     <?php endif ?>
 </retour>
+
+
+
+
+
diff --git a/templates/components/source.tpl.php b/templates/components/source.tpl.php
index 8c5f155..e0a2e12 100644
--- a/templates/components/source.tpl.php
+++ b/templates/components/source.tpl.php
@@ -11,7 +11,7 @@
     <documentSourceName><![CDATA[<?= $component->getName() ?>]]></documentSourceName>
     <documentSourceFile><![CDATA[<?= $component->getFile() ?>]]></documentSourceFile>
     <?php if ($component->getPath()) : ?>
-        <documentSourcePath><?= $component->getPath() ?></documentSourcePath>
+        <documentSourcePath><![CDATA[<?= $component->getPath() ?>]]></documentSourcePath>
     <?php endif ?>
     <?php if ($component->getSourceLanguages()) : ?>
         <?php foreach ($component->getSourceLanguages() as $target) : ?>
@@ -19,6 +19,6 @@
         <?php endforeach; ?>
     <?php endif; ?>
     <?php if ($component->getSize()) : ?>
-        <documentSourceSize><?= $component->getSize() ?></documentSourceSize>
+        <documentSourceSize><![CDATA[<?= $component->getSize() ?>]]></documentSourceSize>
     <?php endif ?>
 </documentSource>
diff --git a/tests/src/SanitizationTest.php b/tests/src/SanitizationTest.php
index ae1fa87..17eaae5 100644
--- a/tests/src/SanitizationTest.php
+++ b/tests/src/SanitizationTest.php
@@ -37,7 +37,7 @@ public function testSensitization($name, array $setters, array $getters)
 
         $actual = $poetry->get('component.'.$name)->fromXml($xml);
         // If XML is not valid test will fail here.
-        $xml = new \SimpleXMLElement($xml);
+        new \SimpleXMLElement($xml);
         foreach ($getters as $getter => $value) {
             expect($actual->$getter($value))->to->equal($value);
         }
diff --git a/tests/src/fixtures/sanitization.yml b/tests/src/fixtures/sanitization.yml
index 8018d78..dd93cd6 100644
--- a/tests/src/fixtures/sanitization.yml
+++ b/tests/src/fixtures/sanitization.yml
@@ -1,37 +1,113 @@
-- component: details
+#- component: details
+#  setters:
+#    setClientId: "<ID>"
+#    setResponsible: "</Responsible>"
+#    setApplicationId: "application .>? Id"
+#    setAuthor: "DIGIT \ <> "
+#    setRequester: "DGCOMM \\<>"
+#    setTitle: "Title > <"
+#    setRemark: "Remark!!{}"
+#    setType: "INTER*^%(#"
+#    setDestination: "AUTRE{}<[[]]"
+#    setProcedure: "NEANT"
+#    setDelay: "11/12/\\2007"
+#    setRequestDate: "11\/12/2007"
+#    setStatus: "Ready!><"
+#    setInterServices: "<Yes?"
+#    setInterInstitution: "/<Yes>"
+#    setReferenceFilesRemark: "<<<Note>>>"
+#    setWorkflowCode: "!!STS"
+#  getters:
+#    getClientId: "<ID>"
+#    getResponsible: "</Responsible>"
+#    getApplicationId: "application .>? Id"
+#    getAuthor: "DIGIT \ <> "
+#    getRequester: "DGCOMM \\<>"
+#    getTitle: "Title > <"
+#    getRemark: "Remark!!{}"
+#    getType: "INTER*^%(#"
+#    getDestination: "AUTRE{}<[[]]"
+#    getProcedure: "NEANT"
+#    getDelay: "11/12/\\2007"
+#    getRequestDate: "11\/12/2007"
+#    getStatus: "Ready!><"
+#    getInterServices: "<Yes?"
+#    getInterInstitution: "/<Yes>"
+#    getReferenceFilesRemark: "<<<Note>>>"
+#    getWorkflowCode: "!!STS"
+#
+#- component: contact
+#  setters:
+#    setType: '<Type>'
+#    setAction: '<Action>'
+#    setNickname: '<.> </>*&^%$#@!'
+#    setEmail: 'info@example.org'
+#  getters:
+#    getType: '<Type>'
+#    getAction: '<Action>'
+#    getNickname: '<.> </>*&^%$#@!'
+#    getEmail: 'info@example.org'
+#
+#- component: reference_document
+#  setters:
+#    setLanguage: '< !@#$%^&*()_"''+ >'
+#    setFormat: '< !@#$%^&*()_+ >'
+#    setType: '< !@#$%^&*()_+ >'
+#    setAction: '< !@#$%^&*()_+ >'
+#    setName: '</Name>'
+#    setPath: '<.> </>*&^%$#@!'
+#    setSize: '123Mb<>'
+#    setFile: '<File>'
+#  getters:
+#    getLanguage: '< !@#$%^&*()_"''+ >'
+#    getFormat: '< !@#$%^&*()_+ >'
+#    getType: '< !@#$%^&*()_+ >'
+#    getAction: '< !@#$%^&*()_+ >'
+#    getName: '</Name>'
+#    getPath: '<.> </>*&^%$#@!'
+#    getSize: '123Mb<>'
+#    getFile: '<File>'
+#
+#- component: return_address
+#  setters:
+#    setType: "<'\"!@#$>"
+#    setAction: "<'\"!@#$>"
+#    setUser: "<'\"!@#$>"
+#    setPassword: "<'\"!@#$>"
+#    setAddress: "<'\"!@#$>"
+#    setPath: "<'\"!@#$>"
+#    setRemark: "<'\"!@#$>"
+#  getters:
+#    getType: "<'\"!@#$>"
+#    getAction: "<'\"!@#$>"
+#    getUser: "<'\"!@#$>"
+#    getPassword: "<'\"!@#$>"
+#    getAddress: "<'\"!@#$>"
+#    getPath: "<'\"!@#$>"
+#    getRemark: "<'\"!@#$>"
+
+- component: source
   setters:
-    setClientId: "<ID>"
-    setResponsible: "</Responsible>"
-    setApplicationId: "applicationId"
-    setAuthor: "DIGIT \ <> "
-    setRequester: "DGCOMM \\<>"
-    setTitle: "Title > <"
-    setRemark: "Remark!!{}"
-    setType: "INTER*^%(#"
-    setDestination: "AUTRE{}<[[]]"
-    setProcedure: "NEANT"
-    setDelay: "11/12/\\2007"
-    setRequestDate: "11\/12/2007"
-    setStatus: "Ready!><"
-    setInterServices: "<Yes?"
-    setInterInstitution: "/<Yes>"
-    setReferenceFilesRemark: "<<<Note>>>"
-    setWorkflowCode: "!!STS"
+    setChannel: '<id="setChannel"></123>'
+    setDeadline: '<id="setDeadline"></123>'
+    setDeadlineStatus: '<id="setDeadlineStatus"></123>'
+    setConfidential: '<id="setConfidential"></123>'
+    setFormat: '<id="setFormat"></123>'
+    setLegiswriteFormat: '<id="setLegiswriteFormat"></123>'
+    setTrackChanges: '<id="setTrackChanges"></123>'
+    setName: '<id="setName"></123>'
+    setFile: '<id="setFile"></123>'
+    setPath: '<id="setPath"></123>'
+    setSize: '<id="setSize"></123>'
   getters:
-    getClientId: "<ID>"
-    getResponsible: "</Responsible>"
-    getApplicationId: "applicationId"
-    getAuthor: "DIGIT \ <> "
-    getRequester: "DGCOMM \\<>"
-    getTitle: "Title > <"
-    getRemark: "Remark!!{}"
-    getType: "INTER*^%(#"
-    getDestination: "AUTRE{}<[[]]"
-    getProcedure: "NEANT"
-    getDelay: "11/12/\\2007"
-    getRequestDate: "11\/12/2007"
-    getStatus: "Ready!><"
-    getInterServices: "<Yes?"
-    getInterInstitution: "/<Yes>"
-    getReferenceFilesRemark: "<<<Note>>>"
-    getWorkflowCode: "!!STS"
+    getChannel: '<id="setChannel"></123>'
+    getDeadline: '<id="setDeadline"></123>'
+    getDeadlineStatus: '<id="setDeadlineStatus"></123>'
+    getConfidential: '<id="setConfidential"></123>'
+    getFormat: '<id="setFormat"></123>'
+    getLegiswriteFormat: '<id="setLegiswriteFormat"></123>'
+    getTrackChanges: '<id="setTrackChanges"></123>'
+    getName: '<id="setName"></123>'
+    getFile: '<id="setFile"></123>'
+    getPath: '<id="setPath"></123>'
+    getSize: '<id="setSize"></123>'