diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
index 7db4c2701bf96cbebb5ac2ea63613c8996b89cae..2ab3ff334d586d6aa56ea54d727e3cfda0c8215a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.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>
@@ -107,13 +104,13 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by title, to reset any sort on preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>link=Account Name</td>\n
+  <td>//button[@title=\'Account Name\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>link=GAP No</td>\n
+  <td>//button[@title=\'GAP No\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -142,7 +139,7 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>link=GAP No</td>\n
+  <td>//button[@title=\'GAP No\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -170,7 +167,7 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- make sure we end up sorting in ASCENDING-->\n
   <td>clickAndWait</td>\n
-  <td>link=GAP No</td>\n
+  <td>//button[@title=\'GAP No\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index fc9afb48e033d9a7d2a778e81ae0e9424950c1cd..2b82dfea308730c4f925388dbb683e6eae360640 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-59
\ No newline at end of file
+60
\ No newline at end of file
diff --git a/bt5/erp5_accounting_ui_test/bt/template_catalog_scriptable_key_list b/bt5/erp5_accounting_ui_test/bt/template_catalog_scriptable_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391