diff --git a/src/common/test/single_attribute.cc b/src/common/test/single_attribute.cc
index 4da4a0daed..cd9462e0d4 100644
--- a/src/common/test/single_attribute.cc
+++ b/src/common/test/single_attribute.cc
@@ -73,8 +73,8 @@ public:
         am = a->to_xml();
         bm = b->to_xml();
 
-        CPPUNIT_ASSERT(*am == "<SINGLE_A></SINGLE_A>");
-        CPPUNIT_ASSERT(*bm == "<SINGLE_B>value_b</SINGLE_B>");
+        CPPUNIT_ASSERT(*am == "<SINGLE_A><![CDATA[]]></SINGLE_A>");
+        CPPUNIT_ASSERT(*bm == "<SINGLE_B><![CDATA[value_b]]></SINGLE_B>");
 
         delete am;
         delete bm;
diff --git a/src/common/test/vector_attribute.cc b/src/common/test/vector_attribute.cc
index aa41b7c6c9..5c6b3d634d 100644
--- a/src/common/test/vector_attribute.cc
+++ b/src/common/test/vector_attribute.cc
@@ -92,8 +92,9 @@ public:
         bm = b->to_xml();
 
         CPPUNIT_ASSERT(*am == "<VECTOR_A></VECTOR_A>");
-        CPPUNIT_ASSERT(*bm == "<VECTOR_B><attr1>val1</attr1><attr2>val2</attr2>"
-                              "<attr3>val3</attr3></VECTOR_B>");
+        CPPUNIT_ASSERT(*bm == "<VECTOR_B><attr1><![CDATA[val1]]></attr1><attr2>"
+                              "<![CDATA[val2]]></attr2><attr3><![CDATA[val3]]>"
+                              "</attr3></VECTOR_B>");
         delete am;
         delete bm;
     }
diff --git a/src/template/test/template.cc b/src/template/test/template.cc
index 15fdcf9574..bba056c88b 100644
--- a/src/template/test/template.cc
+++ b/src/template/test/template.cc
@@ -54,11 +54,14 @@ public:
             "GRAPHICS=PORT=12@^_^@VNC=127.0.0.1\nMEMORY=345\n"
             "REQUIREMENTS=HOSTNAME = \"host*.com\"\n";
 
-        test_ok_xml="<TEMPLATE><CPU>4</CPU><DISK><EXTRA>disk attribute </EXTRA>"
-            "<FILE>path1</FILE></DISK><DISK><EXTRA>str</EXTRA><FILE>path2</FILE>"
-            "<TYPE>disk</TYPE></DISK><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS></TEMPLATE>";
+        test_ok_xml="<TEMPLATE><CPU><![CDATA[4]]></CPU><DISK><EXTRA>"
+            "<![CDATA[disk attribute ]]></EXTRA><FILE><![CDATA[path1]]></FILE>"
+            "</DISK><DISK><EXTRA><![CDATA[str]]></EXTRA><FILE><![CDATA[path2]]>"
+            "</FILE><TYPE><![CDATA[disk]]></TYPE></DISK><EMPTY_VAR><![CDATA[]]>"
+            "</EMPTY_VAR><GRAPHICS><PORT><![CDATA[12]]></PORT><VNC>"
+            "<![CDATA[127.0.0.1]]></VNC></GRAPHICS><MEMORY><![CDATA[345]]>"
+            "</MEMORY><REQUIREMENTS><![CDATA[HOSTNAME = \"host*.com\"]]>"
+            "</REQUIREMENTS></TEMPLATE>";
 
         test_ok_str=
             "\n\tCPU=4"
@@ -161,14 +164,16 @@ public:
 
         tmp = attrs[0]->to_xml();
         CPPUNIT_ASSERT( *tmp == 
-            "<DISK><EXTRA>disk attribute </EXTRA><FILE>path1</FILE></DISK>");
+            "<DISK><EXTRA><![CDATA[disk attribute ]]></EXTRA><FILE>"
+            "<![CDATA[path1]]></FILE></DISK>");
         delete tmp;
 
         CPPUNIT_ASSERT(attrs[1]->type() == Attribute::VECTOR);
         
         tmp = attrs[1]->to_xml();
         CPPUNIT_ASSERT( *tmp == 
-            "<DISK><EXTRA>str</EXTRA><FILE>path2</FILE><TYPE>disk</TYPE></DISK>");
+            "<DISK><EXTRA><![CDATA[str]]></EXTRA><FILE><![CDATA[path2]]>"
+            "</FILE><TYPE><![CDATA[disk]]></TYPE></DISK>");
         delete tmp;
 
         CPPUNIT_ASSERT(t1->get("CPU",attrs) == 1 );
@@ -176,7 +181,7 @@ public:
         CPPUNIT_ASSERT(attrs[2]->type() == Attribute::SIMPLE);
         
         tmp = attrs[2]->to_xml();
-        CPPUNIT_ASSERT( *tmp == "<CPU>4</CPU>");
+        CPPUNIT_ASSERT( *tmp == "<CPU><![CDATA[4]]></CPU>");
         delete tmp;
 
         string sval;
@@ -200,9 +205,11 @@ public:
         vector<Attribute*> attrs;
         
         string t1_xml;
-        string rm_xml="<TEMPLATE><CPU>4</CPU><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS></TEMPLATE>";
+        string rm_xml="<TEMPLATE><CPU><![CDATA[4]]></CPU><EMPTY_VAR>"
+            "<![CDATA[]]></EMPTY_VAR><GRAPHICS><PORT><![CDATA[12]]></PORT><VNC>"
+            "<![CDATA[127.0.0.1]]></VNC></GRAPHICS><MEMORY><![CDATA[345]]>"
+            "</MEMORY><REQUIREMENTS><![CDATA[HOSTNAME = \"host*.com\"]]>"
+            "</REQUIREMENTS></TEMPLATE>";
 
         t1->remove("DISK",attrs);
         t1->to_xml(t1_xml);
@@ -218,12 +225,15 @@ public:
 
     void test_set()
     {
-        string t1_xml="<TEMPLATE><CPU>4</CPU><DISK><EXTRA>disk attribute </EXTRA>"
-            "<FILE>path1</FILE></DISK><DISK><EXTRA>str</EXTRA><FILE>path2</FILE>"
-            "<TYPE>disk</TYPE></DISK><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS>"
-            "<XTRA>44</XTRA></TEMPLATE>";
+        string t1_xml="<TEMPLATE><CPU><![CDATA[4]]></CPU><DISK><EXTRA>"
+            "<![CDATA[disk attribute ]]></EXTRA><FILE><![CDATA[path1]]>"
+            "</FILE></DISK><DISK><EXTRA><![CDATA[str]]></EXTRA><FILE>"
+            "<![CDATA[path2]]></FILE><TYPE><![CDATA[disk]]></TYPE></DISK>"
+            "<EMPTY_VAR><![CDATA[]]></EMPTY_VAR><GRAPHICS><PORT><![CDATA[12]]>"
+            "</PORT><VNC><![CDATA[127.0.0.1]]></VNC></GRAPHICS><MEMORY>"
+            "<![CDATA[345]]></MEMORY><REQUIREMENTS>"
+            "<![CDATA[HOSTNAME = \"host*.com\"]]></REQUIREMENTS><XTRA>"
+            "<![CDATA[44]]></XTRA></TEMPLATE>";
         string xml;
         
         string nattr = "XTRA";
@@ -239,13 +249,14 @@ public:
         nattr = "CPU";
         vattr = "5";
 
-        t1_xml="<TEMPLATE><CPU>4</CPU><CPU>5</CPU>"
-            "<DISK><EXTRA>disk attribute </EXTRA>"
-            "<FILE>path1</FILE></DISK><DISK><EXTRA>str</EXTRA><FILE>path2</FILE>"
-            "<TYPE>disk</TYPE></DISK><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS>"
-            "<XTRA>44</XTRA></TEMPLATE>";
+        t1_xml="<TEMPLATE><CPU><![CDATA[4]]></CPU><CPU><![CDATA[5]]></CPU><DISK"
+        "><EXTRA><![CDATA[disk attribute ]]></EXTRA><FILE><![CDATA[path1]]>"
+        "</FILE></DISK><DISK><EXTRA><![CDATA[str]]></EXTRA><FILE><![CDATA[path2"
+        "]]></FILE><TYPE><![CDATA[disk]]></TYPE></DISK><EMPTY_VAR><![CDATA[]]>"
+        "</EMPTY_VAR><GRAPHICS><PORT><![CDATA[12]]></PORT><VNC><![CDATA[127.0.0"
+        ".1]]></VNC></GRAPHICS><MEMORY><![CDATA[345]]></MEMORY><REQUIREMENTS>"
+        "<![CDATA[HOSTNAME = \"host*.com\"]]></REQUIREMENTS><XTRA><![CDATA[44]]"
+        "></XTRA></TEMPLATE>";
         SingleAttribute *b = new SingleAttribute(nattr,vattr);
 
         t1->set(b);
@@ -253,16 +264,17 @@ public:
 
         CPPUNIT_ASSERT(t1_xml == xml);
 
-        string tr_xml="<TEMPLATE><CPU>5</CPU>"
-            "<DISK><EXTRA>str</EXTRA><FILE>path2</FILE>"
-            "<TYPE>disk</TYPE></DISK><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS></TEMPLATE>";
+        string tr_xml="<TEMPLATE><CPU><![CDATA[5]]></CPU><DISK><EXTRA><![CDATA["
+        "str]]></EXTRA><FILE><![CDATA[path2]]></FILE><TYPE><![CDATA[disk]]></TY"
+        "PE></DISK><EMPTY_VAR><![CDATA[]]></EMPTY_VAR><GRAPHICS><PORT><![CDATA["
+        "12]]></PORT><VNC><![CDATA[127.0.0.1]]></VNC></GRAPHICS><MEMORY><![CDAT"
+        "A[345]]></MEMORY><REQUIREMENTS><![CDATA[HOSTNAME = \"host*.com\"]]></R"
+        "EQUIREMENTS></TEMPLATE>";
         SingleAttribute *c = new SingleAttribute(nattr,vattr);
 
         tr->set(c);
         tr->to_xml(xml);
-        
+
         CPPUNIT_ASSERT(tr_xml == xml);
     }
 
diff --git a/src/template/test/template_sql.cc b/src/template/test/template_sql.cc
index 36689745e4..4947360a7b 100644
--- a/src/template/test/template_sql.cc
+++ b/src/template/test/template_sql.cc
@@ -100,12 +100,7 @@ public:
             " ]\n";
 
         template_xml =
-            "<TEMPLATE><CPU>4</CPU><DISK><EXTRA>disk "
-            "attribute </EXTRA><FILE>path1</FILE></DISK><DISK><EXTRA>str"
-            "</EXTRA><FILE>path2</FILE>"
-            "<TYPE>disk</TYPE></DISK><EMPTY_VAR></EMPTY_VAR><GRAPHICS>"
-            "<PORT>12</PORT><VNC>127.0.0.1</VNC></GRAPHICS><MEMORY>345</MEMORY>"
-            "<REQUIREMENTS>HOSTNAME = \"host*.com\"</REQUIREMENTS></TEMPLATE>";
+            "<TEMPLATE><CPU><![CDATA[4]]></CPU><DISK><EXTRA><![CDATA[disk attribute ]]></EXTRA><FILE><![CDATA[path1]]></FILE></DISK><DISK><EXTRA><![CDATA[str]]></EXTRA><FILE><![CDATA[path2]]></FILE><TYPE><![CDATA[disk]]></TYPE></DISK><EMPTY_VAR><![CDATA[]]></EMPTY_VAR><GRAPHICS><PORT><![CDATA[12]]></PORT><VNC><![CDATA[127.0.0.1]]></VNC></GRAPHICS><MEMORY><![CDATA[345]]></MEMORY><REQUIREMENTS><![CDATA[HOSTNAME = \"host*.com\"]]></REQUIREMENTS></TEMPLATE>";
     }
 
     ~TemplateSQLTest(){};
diff --git a/src/vm/test/VirtualMachinePoolTest.cc b/src/vm/test/VirtualMachinePoolTest.cc
index 4544e02a32..f575b70fe6 100644
--- a/src/vm/test/VirtualMachinePoolTest.cc
+++ b/src/vm/test/VirtualMachinePoolTest.cc
@@ -48,14 +48,16 @@ const string xmls[] =
     "<VM><ID>0</ID><UID>123</UID><NAME>VM one</NAME><LAST_POLL>0</LAST_POLL><ST"
     "ATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0</ET"
     "IME><DEPLOY_ID></DEPLOY_ID><MEMORY>0</MEMORY><CPU>0</CPU><NET_TX>0</NET_TX"
-    "><NET_RX>0</NET_RX><TEMPLATE><CPU>1</CPU><MEMORY>128</MEMORY><NAME>VM one<"
-    "/NAME><VMID>0</VMID></TEMPLATE></VM>",
+    "><NET_RX>0</NET_RX><TEMPLATE><CPU><![CDATA[1]]></CPU><MEMORY><![CDATA[128]"
+    "]></MEMORY><NAME><![CDATA[VM one]]></NAME><VMID><![CDATA[0]]></VMID>"
+    "</TEMPLATE></VM>",
 
     "<VM><ID>1</ID><UID>261</UID><NAME>Second VM</NAME><LAST_POLL>0</LAST_POLL>"
     "<STATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0<"
     "/ETIME><DEPLOY_ID></DEPLOY_ID><MEMORY>0</MEMORY><CPU>0</CPU><NET_TX>0</NET"
-    "_TX><NET_RX>0</NET_RX><TEMPLATE><CPU>2</CPU><MEMORY>256</MEMORY><NAME>Seco"
-    "nd VM</NAME><VMID>1</VMID></TEMPLATE></VM>",
+    "_TX><NET_RX>0</NET_RX><TEMPLATE><CPU><![CDATA[2]]></CPU><MEMORY>"
+    "<![CDATA[256]]></MEMORY><NAME><![CDATA[Second VM]]></NAME><VMID>"
+    "<![CDATA[1]]></VMID></TEMPLATE></VM>",
 
     "<VM><ID>0</ID><UID>123</UID><NAME>VM one</NAME><LAST_POLL>0</LAST_POLL><ST"
     "ATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0</ET"
diff --git a/src/vnm/test/VirtualNetworkPoolTest.cc b/src/vnm/test/VirtualNetworkPoolTest.cc
index a180662b73..aa569139c8 100644
--- a/src/vnm/test/VirtualNetworkPoolTest.cc
+++ b/src/vnm/test/VirtualNetworkPoolTest.cc
@@ -62,22 +62,28 @@ const string templates[] =
 const string xmls[] =
 {
             "<VNET><ID>0</ID><UID>123</UID><NAME>Net number one</NAME>"
-            "<TYPE>1</TYPE><BRIDGE>br1</BRIDGE><TEMPLATE><BRIDGE>br1</BRIDGE>"
-            "<LEASES><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC></LEASES>"
-            "<NAME>Net number one</NAME><TYPE>FIXED</TYPE></TEMPLATE><LEASES>"
+            "<TYPE>1</TYPE><BRIDGE>br1</BRIDGE><TEMPLATE><BRIDGE>"
+            "<![CDATA[br1]]></BRIDGE><LEASES><IP><![CDATA[130.10.0.1]]>"
+            "</IP><MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME>"
+            "<![CDATA[Net number one]]></NAME><TYPE><![CDATA[FIXED]]></TYPE>"
+            "</TEMPLATE><LEASES>"
             "<LEASE><IP>130.10.0.1</IP><MAC>50:20:20:20:20:20</MAC>"
             "<USED>0</USED><VID>-1</VID></LEASE></LEASES></VNET>",
 
             "<VNET><ID>1</ID><UID>261</UID><NAME>A virtual network</NAME>"
-            "<TYPE>0</TYPE><BRIDGE>br0</BRIDGE><TEMPLATE><BRIDGE>br0</BRIDGE>"
-            "<NAME>A virtual network</NAME><NETWORK_ADDRESS>192.168.0.0</NETWORK_ADDRESS>"
-            "<NETWORK_SIZE>C</NETWORK_SIZE><TYPE>RANGED</TYPE></TEMPLATE>"
+            "<TYPE>0</TYPE><BRIDGE>br0</BRIDGE><TEMPLATE><BRIDGE>"
+            "<![CDATA[br0]]></BRIDGE><NAME><![CDATA[A virtual network]]>"
+            "</NAME><NETWORK_ADDRESS><![CDATA[192.168.0.0]]></NETWORK_ADDRESS>"
+            "<NETWORK_SIZE><![CDATA[C]]></NETWORK_SIZE><TYPE><![CDATA[RANGED]]>"
+            "</TYPE></TEMPLATE>"
             "<LEASES></LEASES></VNET>",
 
             "<VNET><ID>0</ID><UID>133</UID><NAME>Net number two</NAME>"
-            "<TYPE>1</TYPE><BRIDGE>br1</BRIDGE><TEMPLATE><BRIDGE>br1</BRIDGE><"
-            "LEASES><IP>130.10.2.1</IP><MAC>50:20:20:20:20:20</MAC></LEASES>"
-            "<NAME>Net number two</NAME><TYPE>fixed</TYPE></TEMPLATE>"
+            "<TYPE>1</TYPE><BRIDGE>br1</BRIDGE><TEMPLATE><BRIDGE>"
+            "<![CDATA[br1]]></BRIDGE><LEASES><IP><![CDATA[130.10.2.1]]></IP>"
+            "<MAC><![CDATA[50:20:20:20:20:20]]></MAC></LEASES><NAME>"
+            "<![CDATA[Net number two]]></NAME><TYPE><![CDATA[fixed]]></TYPE>"
+            "</TEMPLATE>"
             "<LEASES><LEASE><IP>130.10.2.1</IP>"
             "<MAC>50:20:20:20:20:20</MAC><USED>0</USED><VID>-1</VID>"
             "</LEASE></LEASES></VNET>"