diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0dd075d48e6..64bad21ede1 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -103,16 +103,16 @@ Dashboard for CRM will include:
         'crm_action_rule_demo.xml',
     ],
     'test': [
-        'test/process/communication_with_customer.yml',
-        'test/process/lead2opportunity2win.yml',
-        'test/process/lead2opportunity_assign_salesmen.yml',
-        'test/process/merge_opportunity.yml',
-        'test/process/cancel_lead.yml',
-        'test/process/segmentation.yml',
-        'test/process/phonecalls.yml',
-        'test/ui/crm_demo.yml',
-        'test/ui/duplicate_lead.yml',
-        'test/ui/delete_lead.yml',
+        'test/crm_lead_message.yml',
+        'test/lead2opportunity2win.yml',
+        'test/lead2opportunity_assign_salesmen.yml',
+        'test/crm_lead_merge.yml',
+        'test/crm_lead_cancel.yml',
+        'test/segmentation.yml',
+        'test/phonecalls.yml',
+        'test/crm_lead_onchange.yml',
+        'test/crm_lead_copy.yml',
+        'test/crm_lead_unlink.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 724ec491efe..1c4fde258b9 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -7,68 +7,68 @@
             <field name="name">New</field>
             <field eval="1" name="case_default"/>
             <field name="state">draft</field>
-            <field eval="'10'" name="probability"/>
-            <field eval="'10'" name="sequence"/>
+            <field eval="0" name="probability"/>
+            <field eval="10" name="sequence"/>
             <field name="type">both</field>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Opportunity</field>
             <field eval="1" name="case_default"/>
             <field name="state">open</field>
-            <field eval="'20'" name="probability"/>
-            <field eval="'11'" name="sequence"/>
+            <field eval="20" name="probability"/>
+            <field eval="20" name="sequence"/>
             <field name="type">lead</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead3">
-            <field name="name">Qualification</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="'20'" name="probability"/>
-            <field eval="'12'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-        <record model="crm.case.stage" id="stage_lead4">
-            <field name="name">Proposition</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="'40'" name="probability"/>
-            <field eval="'13'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-        <record model="crm.case.stage" id="stage_lead5">
-            <field name="name">Negotiation</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="'60'" name="probability"/>
-            <field eval="'14'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-        <record model="crm.case.stage" id="stage_lead6">
-            <field name="name">Won</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">done</field>
-            <field eval="'100'" name="probability"/>
-            <field eval="'15'" name="sequence"/>
-            <field eval="1" name="on_change"/>
-            <field name="type">opportunity</field>
-        </record>
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Dead</field>
             <field eval="1" name="case_default"/>
             <field eval="False" name="fold"/>
             <field name="state">cancel</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'16'" name="sequence"/>
+            <field eval="0" name="probability"/>
+            <field eval="30" name="sequence"/>
             <field name="type">lead</field>
         </record>
+        <record model="crm.case.stage" id="stage_lead3">
+            <field name="name">Qualification</field>
+            <field eval="1" name="case_default"/>
+            <field name="state">open</field>
+            <field eval="20" name="probability"/>
+            <field eval="100" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+        <record model="crm.case.stage" id="stage_lead4">
+            <field name="name">Proposition</field>
+            <field eval="1" name="case_default"/>
+            <field name="state">open</field>
+            <field eval="40" name="probability"/>
+            <field eval="110" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+        <record model="crm.case.stage" id="stage_lead5">
+            <field name="name">Negotiation</field>
+            <field eval="1" name="case_default"/>
+            <field name="state">open</field>
+            <field eval="60" name="probability"/>
+            <field eval="120" name="sequence"/>
+            <field name="type">opportunity</field>
+        </record>
+        <record model="crm.case.stage" id="stage_lead6">
+            <field name="name">Won</field>
+            <field eval="1" name="case_default"/>
+            <field name="state">done</field>
+            <field eval="100" name="probability"/>
+            <field eval="130" name="sequence"/>
+            <field eval="1" name="on_change"/>
+            <field name="type">opportunity</field>
+        </record>
         <record model="crm.case.stage" id="stage_lead8">
             <field name="name">Lost</field>
             <field eval="1" name="case_default"/>
             <field eval="True" name="fold"/>
             <field eval="1" name="on_change"/>
             <field name="state">cancel</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'17'" name="sequence"/>
+            <field eval="0" name="probability"/>
+            <field eval="140" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
         
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2c8d311bea4..e42ac81e108 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -100,6 +100,7 @@
                     <button name="case_cancel" string="Cancel Case" type="object"
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
+                            domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/crm_lead_cancel.yml
similarity index 100%
rename from addons/crm/test/process/cancel_lead.yml
rename to addons/crm/test/crm_lead_cancel.yml
diff --git a/addons/crm/test/ui/duplicate_lead.yml b/addons/crm/test/crm_lead_copy.yml
similarity index 100%
rename from addons/crm/test/ui/duplicate_lead.yml
rename to addons/crm/test/crm_lead_copy.yml
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/crm_lead_merge.yml
similarity index 100%
rename from addons/crm/test/process/merge_opportunity.yml
rename to addons/crm/test/crm_lead_merge.yml
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/crm_lead_message.yml
similarity index 100%
rename from addons/crm/test/process/communication_with_customer.yml
rename to addons/crm/test/crm_lead_message.yml
diff --git a/addons/crm/test/ui/crm_demo.yml b/addons/crm/test/crm_lead_onchange.yml
similarity index 100%
rename from addons/crm/test/ui/crm_demo.yml
rename to addons/crm/test/crm_lead_onchange.yml
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/crm_lead_unlink.yml
similarity index 100%
rename from addons/crm/test/ui/delete_lead.yml
rename to addons/crm/test/crm_lead_unlink.yml
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
similarity index 100%
rename from addons/crm/test/process/lead2opportunity2win.yml
rename to addons/crm/test/lead2opportunity2win.yml
diff --git a/addons/crm/test/process/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
similarity index 100%
rename from addons/crm/test/process/lead2opportunity_assign_salesmen.yml
rename to addons/crm/test/lead2opportunity_assign_salesmen.yml
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/phonecalls.yml
similarity index 100%
rename from addons/crm/test/process/phonecalls.yml
rename to addons/crm/test/phonecalls.yml
diff --git a/addons/crm/test/process/segmentation.yml b/addons/crm/test/segmentation.yml
similarity index 100%
rename from addons/crm/test/process/segmentation.yml
rename to addons/crm/test/segmentation.yml