diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
index 06643ddd2516c1f94aa3b440f0bcb29bbfc508d4..b83294d31c53397271f967f98faacab1233ddc78 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -96,12 +93,6 @@ Test display of Account Module, with at_date parameter\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_module</td>\n
@@ -312,12 +303,6 @@ Test display of Account Module, with at_date parameter\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
index 806f293ee767ee0e0a085a176d64bd59b4adcfdd..cfd4fcdb10cc366c84dcdaa4bcfa85c3e5f40b7d 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -96,12 +93,6 @@ Test display of Account Module, with from_date parameter (which has no impact)\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_module</td>\n
@@ -600,12 +591,6 @@ Test display of Account Module, with from_date parameter (which has no impact)\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
index e2d256b239acff079a88712477512443ef175600..7fb2efdcd5ade515cd3b1d9d8237ef3db08037ff 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -96,12 +93,6 @@ Test Transactions related to an account, with at date parameter\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 <!-- {{{ Select Receivable account and check transaction list -->\n
@@ -204,12 +195,6 @@ Test Transactions related to an account, with at date parameter\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
index f318a61705db2cf6c661f09f8af913a2bd9215af..a9262fb412672b6b1792b78e38603ddde16ec0b5 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -96,12 +93,6 @@ Test Transactions related to an account, with from date parameter\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_module</td>\n
@@ -252,12 +243,6 @@ client 1 invoice or client 2 invoice will have the first uid. -->\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_bank_account_transaction_list_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_bank_account_transaction_list_at_date.html.xml
index 98f3d1726373018c17b213916b3fa77bf6a2eb28..c6136bece56b23dc4f0c45db09e62a28038da9f4 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_bank_account_transaction_list_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_bank_accounts/test_bank_account_transaction_list_at_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -90,12 +87,6 @@ Test Transactions related to an Organisation, with stop date\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 \n
 <tr>\n
   <td>selectAndWait</td>\n
@@ -201,12 +192,6 @@ balance. -->\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
index 3e3f5cc2f24ae03589bfe716de5df453da3fc063..113dd8f2409fb253aaf3a746900ef01b7de4c88f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -90,12 +87,6 @@ Test Transactions related to an Organisation, with stop date\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 \n
 <tr>\n
   <td>selectAndWait</td>\n
@@ -201,12 +192,6 @@ balance. -->\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
index e5b9d3351fd7763edaae56ead3d7a51080237823..047d6f1268fec4507342b502083b413630deb234 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
@@ -87,12 +87,6 @@ Test Transactions related to an Organisation, with start date\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 \n
 <tr>\n
   <td>selectAndWait</td>\n
@@ -337,12 +331,6 @@ Test Transactions related to an Organisation, with start date\n
   <td>Base_edit:method</td>\n
   <td></td>\n
 </tr>\n
-<!-- XXX manually clear the cache ? -->\n
-<tr>\n
-  <td>clickAndWait</td>\n
-  <td>//button[@title=\'Select Language\']</td>\n
-  <td></td>\n
-</tr>\n
 <!-- }}} -->\n
 \n
 </tbody></table>\n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index c4fbb1cfac0ba7a86115b48a39b49daea09da15a..d97edbb29fa140807215ea46cfdc2b84f4c97dcd 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-97
\ No newline at end of file
+99
\ No newline at end of file