diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableError.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableError.xml
index fc542cd1c263f13fe91367260f8ac75fd5d06992..16350f42e6ec8bd84dcf2072824931e882034e6a 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableError.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableError.xml
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
       xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -62,7 +62,7 @@
 </tr>\n
 <tr>\n
   <td>open</td>\n
-  <td>${base_url}/foo_module/0/view</td>\n
+  <td>${base_url}/foo_module/0</td>\n
   <td></td>\n
   <td>Go to first line</td>\n
 </tr>\n
@@ -92,13 +92,13 @@
 </tr>\n
 <tr>\n
   <td>open</td>\n
-  <td>${base_url}/foo_module/0/view</td>\n
+  <td>${base_url}/foo_module/0</td>\n
   <td></td>\n
   <td>Go to first line</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//a[@href=\'${base_url}/foo_module/0/1/view?selection_index=0&amp;selection_name=foo_line_selection&amp;reset:int=1\']</td>\n
+  <td>//a[@href=\'${base_url}/foo_module/0/1?selection_index=0&amp;selection_name=foo_line_selection&amp;reset:int=1\']</td>\n
   <td></td>\n
   <td>Make sure an no a tag is present in ListBox</td>\n
 </tr>\n
@@ -116,11 +116,9 @@
 </tr>\n
 </tbody></table>\n
 </body>\n
-</html>\n
-\n
+</html>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -134,9 +132,13 @@
             <key> <string>id</string> </key>
             <value> <string>testEditableError</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableNoLink.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableNoLink.xml
index e054a044ebca4c8dbabef0dd932d997b413725d0..52be3d9d1e7df90b1055bc198ba01e7e4e312ad5 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableNoLink.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testEditableNoLink.xml
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
       xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -62,7 +62,7 @@
 </tr>\n
 <tr>\n
   <td>open</td>\n
-  <td>${base_url}/foo_module/0/view</td>\n
+  <td>${base_url}/foo_module/0</td>\n
   <td></td>\n
   <td>Go to first line</td>\n
 </tr>\n
@@ -92,13 +92,13 @@
 </tr>\n
 <tr>\n
   <td>open</td>\n
-  <td>${base_url}/foo_module/0/view</td>\n
+  <td>${base_url}/foo_module/0</td>\n
   <td></td>\n
   <td>Go to first line</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//a[@href=\'${base_url}/foo_module/0/1/view?selection_index=0&amp;selection_name=foo_line_selection&amp;reset:int=1\']</td>\n
+  <td>//a[@href=\'${base_url}/foo_module/0/1?selection_index=0&amp;selection_name=foo_line_selection&amp;reset:int=1\']</td>\n
   <td></td>\n
   <td>Make sure an no a tag is present in ListBox</td>\n
 </tr>\n
@@ -116,11 +116,9 @@
 </tr>\n
 </tbody></table>\n
 </body>\n
-</html>\n
-\n
+</html>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -134,9 +132,13 @@
             <key> <string>id</string> </key>
             <value> <string>testEditableNoLink</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml
index 67d90c367869de6f6ac799931075167d28553326..2b383191fdd4b4f35b6667bb874fc963b5118ebb 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
       xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -73,7 +70,7 @@
 </tr>\n
 <tr>\n
   <td>open</td>\n
-  <td>${base_url}/foo_module/0/view</td>\n
+  <td>${base_url}/foo_module/0</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -103,7 +100,7 @@
 </tr>\n
 <tr>\n
   <td>assertAbsoluteLocation</td>\n
-  <td tal:content="string:glob:${here/portal_url}/foo_module/0/view" />\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -113,16 +110,15 @@
 </tr>\n
 <tr>\n
   <td>assertAbsoluteLocation</td>\n
-  <td tal:content="string:glob:${here/portal_url}/view" />\n
+  <td tal:content="string:glob:${here/portal_url}" />\n
   <td></td>\n
 </tr>\n
 \n
 </tbody></table>\n
 </body>\n
-</html>\n
+</html>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -136,9 +132,13 @@
             <key> <string>id</string> </key>
             <value> <string>testBreadCrumbs</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml
index 4a911ece4f5c4ab25c2ec21881f206f8a5e2266d..b7d47df727e30208b0d1973b1f0b0d49123c17ea 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
       xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -54,7 +51,7 @@ Selected</td></tr>\n
 <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n
 <tr>\n
   <td>open</td>\n
-  <td tal:content="string: ${here/portal_url}/foo_module/1/view">/erp5/foo_module/1/view</td>\n
+  <td>${base_url}/foo_module/1</td>\n
   <td></td>\n
 </tr>\n
 <!-- when clicking on the action button of a drop down when nothing is selected\n
@@ -78,7 +75,7 @@ shouldn\'t do anything. -->\n
   </tr>\n
   <tr>\n
     <td>assertAbsoluteLocation</td>\n
-    <td tal:content="string:glob:${here/portal_url}/foo_module/1/view" />\n
+    <td>regexp:${base_url}/foo_module/1(\\?|$$)</td>\n
     <td/>\n
   </tr>\n
   <tr>\n
@@ -88,11 +85,9 @@ shouldn\'t do anything. -->\n
   </tr>\n
 </tal:block>\n
 </body>\n
-</html>\n
-\n
+</html>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -106,9 +101,13 @@ shouldn\'t do anything. -->\n
             <key> <string>id</string> </key>
             <value> <string>testDropDownListActionsNothingSelected</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
index defcb184ab1062f4544711bd4ba67331bb5bee0a..8c71b2cf2f47b79f614e4d6482e9d5f36ea14da4 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
@@ -102,7 +102,7 @@
 </tr>\n
 <tr>\n
   <td>assertAbsoluteLocation</td>\n
-  <td tal:content="string:glob:${here/portal_url}/foo_module/1/view"/>\n
+  <td>${base_url}/foo_module/1</td>\n
   <td></td>\n
   <td></td>\n
 </tr>\n
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
index 1a569c6ee5b02d315d083106cc79cf62f4db67dc..b57ec124f4002b5bf1244748928806a448046dd1 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -74,7 +71,7 @@
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -92,9 +89,13 @@
             <key> <string>id</string> </key>
             <value> <string>BTZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_renderListBox.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_renderListBox.xml
index afd6721487bd26e96ff9b3c00190203a6f870572..048bc5d684cf7e45e8745fe78cc327a0fe3b8269 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_renderListBox.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_renderListBox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,11 +51,11 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <div><p>This is just a test.</p></div>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -76,9 +73,13 @@
             <key> <string>id</string> </key>
             <value> <string>FooModule_renderListBox</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Only a test</string> </value>
+            <value> <unicode>Only a test</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
index 38edf9db01d1211e5da13c407d1fb9dcea14d934..25535d1c632024260595b63eed78fc7383bb74eb 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -139,7 +139,7 @@
 \n
         <tr>\n
           <td>open</td>\n
-          <td>${base_url}/foo_module/0/view</td>\n
+          <td>${base_url}/foo_module/0</td>\n
           <td></td>\n
         </tr>\n
 \n
@@ -195,10 +195,9 @@
   </tal:block>\n
 \n
 \n
-  </tal:block>\n
-
+  </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -216,9 +215,13 @@
             <key> <string>id</string> </key>
             <value> <string>ListBoxDialogModeZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Common Template for ListBoxDialogModeZuite</string> </value>
+            <value> <unicode>Common Template for ListBoxDialogModeZuite</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
index a826253704fcda3ce13039d572bafb45dc473984..9b0a3454281aafea8b0dca1986ca3bb6f68dc4a7 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml
@@ -51,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -79,7 +79,7 @@
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td>${base_url}/foo_module/view</td>\n
+      <td>${base_url}/foo_module</td>\n
       <td></td>\n
     </tr>\n
   </tal:block>\n
@@ -98,10 +98,9 @@
       <td tal:content="set_page"></td>\n
     </tr>\n
   </tal:block>\n
-</tal:block>\n
+</tal:block>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -119,9 +118,13 @@
             <key> <string>id</string> </key>
             <value> <string>ListBoxZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Common Template for ListBoxZuite</string> </value>
+            <value> <unicode>Common Template for ListBoxZuite</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
index cf6825a5f9451ed37a86264abb07635361507809..53847569f08db4d89d066328bb7f2dab904c9965 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -82,14 +79,13 @@
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td>${base_url}/foo_module/view</td>\n
+      <td>${base_url}/foo_module</td>\n
       <td></td>\n
     </tr>\n
   </tal:block>\n
-</tal:block>\n
+</tal:block>
 
-
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -107,9 +103,13 @@
             <key> <string>id</string> </key>
             <value> <string>MatrixBoxZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Common Template for MatrixBoxZuite</string> </value>
+            <value> <unicode>Common Template for MatrixBoxZuite</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
index 3e250e25f8d5b31de5261f6b39a99e622292ba66..dac7a5f95ff2ccc698e247fa69eee03df0222c39 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -96,7 +93,7 @@
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -114,9 +111,13 @@
             <key> <string>id</string> </key>
             <value> <string>PTZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Common Template for PTZuite</string> </value>
+            <value> <unicode>Common Template for PTZuite</unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
index 04559beeb2c2bad379ce1145da41e2ed71efe9b9..e928aef508185bb14d811150baa688a147aa87b7 100644
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -54,7 +51,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
@@ -84,7 +81,7 @@
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -102,9 +99,13 @@
             <key> <string>id</string> </key>
             <value> <string>RelationFieldZuite_CommonTemplate</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index a869e998c0e3bac924179254460c4911d81e84a6..5628fa72e96ce2e8a8bb9acda2e338c4deb08e13 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-638
\ No newline at end of file
+639
\ No newline at end of file