diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml
deleted file mode 100644
index dc266a633e66dd00a5d40529f51598bf871dad53..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/11.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>11</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml
deleted file mode 100644
index a11e21898f72d7b9f77e3098968ea4b9ddd1ffb3..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/13.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>13</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml
deleted file mode 100644
index 7f99836cad833dde79f0c534461c9c2ed6af94df..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/14.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>14</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>source_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>source_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml
deleted file mode 100644
index df9ba4eb837a472e65a879c067d4e3d3c1816100..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/17.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>17</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_function</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_function divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml
deleted file mode 100644
index e37cb63b7b6fcfb504f59662cea2433d13feeee8..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/19.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>19</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_project</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_project divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml
deleted file mode 100644
index 430565c3fb35495b4c16b8b8c396a96c4e744c02..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/20.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>20</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category Membership Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>destination_section</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>destination_section divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml
deleted file mode 100644
index 00e5cc36b54b1722f02b54b3afb8b00f4981beb3..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/21.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="FloatDivergenceTester" module="Products.ERP5Type.Document.FloatDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>21</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Float Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>price</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>price divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml
deleted file mode 100644
index 81b1f267184901cd338445630042a091e0a1cfbf..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/7.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>7</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>DateTime Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>start_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>start_date divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml
deleted file mode 100644
index dcbbcc34bef69e4ebb0fc81d9f4f92c0f5d3c5f2..0000000000000000000000000000000000000000
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/8.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>quantity</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>8</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>DateTime Divergence Tester</string> </value>
-        </item>
-        <item>
-            <key> <string>quantity</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>tested_property</string> </key>
-            <value>
-              <tuple>
-                <string>stop_date</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>stop_date divergence tester</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71cc29897ed0ced98f728e73b68dd7850c4c3aef
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/aggregate_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>aggregate_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>aggregate divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/16.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/16.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
index dfcc2439e4ce18c3d2c0d7d143a7ec7a057824e7..5f9db3567fb63c3f8b4c0b13e59d563ed04678a5 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/16.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_application_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>16</string> </value>
+            <value> <string>base_application_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
index 97635f4374ff3052071bab624bb267d25ed0a353..3710d21db43d20ffaf73bf898204e787086c13f6 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/15.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/base_contribution_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>15</string> </value>
+            <value> <string>base_contribution_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bc96d8de5c3f0344f2ee7d43e30d3e43af544526
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/delivery_mode_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>delivery_mode_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>delivery_mode</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>delivery_mode divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1e8485574eee9c8e3dd65e0bb8bf4556380ad509
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/description_tester.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="StringDivergenceTester" module="Products.ERP5Type.Document.StringDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>description_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>String Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>description</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>description divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_account_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_account_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c95e07e481e1f6a88aa96b17726fdcefab56a6a7
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_account_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_account_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_account</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_account divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/3.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/3.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
index 3594aedd8aa90c01ebec6e8691ad324c3398a725..92ac107f2d4fed1da985fd7e0afb7037c126e15c 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/3.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_administration_tester.xml
@@ -21,23 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>3</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_administration_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination</string>
+                <string>destination_administration</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination divergence tester</string> </value>
+            <value> <string>destination_administration divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
index 76198caf944e5d532a390c3402d85afed9faf744..95ab627b42caf857801812f145b273da2faf59bc 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/9.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_decision_tester.xml
@@ -21,23 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_decision_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>aggregate</string>
+                <string>destination_decision</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>aggregate divergence tester</string> </value>
+            <value> <string>destination_decision divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7549f4265fc22e1c23549f0c4a588c888b5733fd
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_function_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_function_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_function</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_function divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/18.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/18.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
index cc6483d52553b280389f3fb089d95c92dc5fe02c..294cf5b5eeb949d09cce30751d08aeea1b68f704 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/18.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_payment_tester.xml
@@ -21,23 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>18</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>destination_payment_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>destination_account</string>
+                <string>destination_payment</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>destination_account divergence tester</string> </value>
+            <value> <string>destination_payment divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
similarity index 88%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
index 2d05bf123f9e7949b349bb57ad421b5e86af738c..7c5c1d67d6daa53791ba69e1e90105be46604b21 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/1.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_project_tester.xml
@@ -21,19 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
             <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>destination_project_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -47,13 +41,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>resource</string>
+                <string>destination_project</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>resource divergence tester</string> </value>
+            <value> <string>destination_project divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db74f573d7ec4a2a1d630b9f2a109b3ac4e9cd82
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_section_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_section_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_section</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination_section divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ceac2bb776267f4a47a34a0596cbd41dd96bd67
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/destination_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>destination divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a286dad5655d6a4ce2f5a7966ca7894f9a02d420
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/incoterm_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>incoterm_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>incoterm</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>incoterm divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35d65aa3b1e2fc532fe8ae65398a451721429136
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/price_currency_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>price_currency_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>price_currency</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>price_currency divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..91bc42df6a8aceee3500f2fd9523515aed803096
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/quantity_tester.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>use_delivery_ratio</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>quantity_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>quantity</string>
+                <string>quantity_unit</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>quantity divergence tester</string> </value>
+        </item>
+        <item>
+            <key> <string>use_delivery_ratio</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
similarity index 97%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
index 3551769d6be2671f7d77767e212af3aa0388ae79..df6cbcb63611d1d0b8d9de869cfb6acbda27e154 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/4.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/reference_tester.xml
@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>4</string> </value>
+            <value> <string>reference_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb2433449ea0a84076fcbd097c6c4f905cc1a558
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/resource_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>resource_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>resource</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>resource divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
similarity index 82%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
index c73c595f3009d5b81d6cb6650a90edf9c64c47a1..88914408693deebd6e21f4fdcbea1d4a65ae017e 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/12.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_account_tester.xml
@@ -21,23 +21,9 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>12</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>source_account_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15c034d819274239fe93825d1d830cdfdaf182bb
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_administration_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_administration_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_administration</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_administration divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fcb72c6cdfa2db7eae29451836a50a0768bcd21
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_decision_tester.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_decision_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_decision divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_function_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_function_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..08ca7aa2834e3d2f4f9961a4e00806b11cdb25ed
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_function_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_function_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_function</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_function divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/10.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
similarity index 83%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/10.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
index 69d24cc4179203b445e0b88d8065373485c60a0c..2b262fd2bde342f09839379016317248e3f8ce44 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/10.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_payment_tester.xml
@@ -21,23 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
-            <value> <int>1</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>10</string> </value>
-        </item>
-        <item>
-            <key> <string>matching_provider</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string>source_payment_tester</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -47,13 +37,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>price_currency</string>
+                <string>source_payment</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>price_currency divergence tester</string> </value>
+            <value> <string>source_payment divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
similarity index 88%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
index b1358bb2f8f5de54e5cf7f4545084b7fb28db717..b76872dbaa7352c3a7510dadabab15db428a4301 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/2.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_project_tester.xml
@@ -21,19 +21,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
             <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>2</string> </value>
+            <value> <string>source_project_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -47,13 +41,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>source</string>
+                <string>source_project</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>source divergence tester</string> </value>
+            <value> <string>source_project divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9eb20c9fe54af8f994427ce59cb245bb638514c
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_section_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_section_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_section</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source_section divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca8b9fe1440dab321ed3f5f6d28128488c40a5cb
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/source_tester.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMembershipDivergenceTester" module="Products.ERP5Type.Document.CategoryMembershipDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>source_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>source divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/6.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
similarity index 84%
rename from bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/6.xml
rename to bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
index 58c057f2ee669ddb83b8a8c56b369fe1655ec15a..7d635e4ce527c7ae9fd373218c3c9d830c9233cf 100644
--- a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/6.xml
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/start_date_tester.xml
@@ -3,7 +3,7 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="NetConvertedQuantityDivergenceTester" module="Products.ERP5Type.Document.NetConvertedQuantityDivergenceTester"/>
+        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
         <tuple/>
       </tuple>
     </pickle>
@@ -38,19 +38,13 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>divergence_provider</string> </key>
             <value> <int>1</int> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>6</string> </value>
+            <value> <string>start_date_tester</string> </value>
         </item>
         <item>
             <key> <string>matching_provider</string> </key>
@@ -58,7 +52,7 @@
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Net Converted Quantity Divergence Tester</string> </value>
+            <value> <string>DateTime Divergence Tester</string> </value>
         </item>
         <item>
             <key> <string>quantity</string> </key>
@@ -68,13 +62,13 @@
             <key> <string>tested_property</string> </key>
             <value>
               <tuple>
-                <string>quantity</string>
+                <string>start_date</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>quantity divergence tester</string> </value>
+            <value> <string>start_date divergence tester</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f31151e04e64ca8b6c45a9c3fc6bf3e070931867
--- /dev/null
+++ b/bt5/erp5_simulation/PathTemplateItem/portal_rules/new_trade_model_rule/stop_date_tester.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="DateTimeDivergenceTester" module="Products.ERP5Type.Document.DateTimeDivergenceTester"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>quantity</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>divergence_provider</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>stop_date_tester</string> </value>
+        </item>
+        <item>
+            <key> <string>matching_provider</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>DateTime Divergence Tester</string> </value>
+        </item>
+        <item>
+            <key> <string>quantity</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>stop_date</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>stop_date divergence tester</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>