diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index e27d9be8fe6..4e522470f18 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -46,10 +46,7 @@ It also manages the leaves of every resource.
     'demo_xml': ['resource_demo.xml'
     ],
     'test': [
-                'test/process/test_resource.yml',
-                'test/process/test_resource_calendar.yml',
-                'test/ui/on_change_resource.yml',
-                'test/ui/duplicate_resource.yml',
+                'test/resource.yml',
             ],
     'installable': True,
     'active': False,
diff --git a/addons/resource/resource_demo.xml b/addons/resource/resource_demo.xml
index 989a029f93f..6a3c186a44c 100644
--- a/addons/resource/resource_demo.xml
+++ b/addons/resource/resource_demo.xml
@@ -88,21 +88,40 @@
 	        <field name="resource_type">user</field>
         </record>
 
-        <record id="resource_calendar_leaves_demoleave1" model="resource.calendar.leaves">
-	        <field name="name">Morning 2 Hours On Leave</field>
-	        <field name="resource_id" ref="resource_resource_demorsource"/>
+        <record id="resource_analyst" model="resource.resource">
+	        <field eval="1.0" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="name">Analyst</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_designer" model="resource.resource">
+	        <field eval="0.8" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_demo"/>
+	        <field name="name">Designer</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_developer" model="resource.resource">
+	        <field eval="0.8" name="time_efficiency"/>
+	        <field name="user_id" ref="base.user_demo"/>
+	        <field name="name">Developer</field>
+	        <field eval="1" name="active"/>
+	        <field name="calendar_id" ref="timesheet_group1"/>
+	        <field name="resource_type">user</field>
+        </record>
+
+        <record id="resource_analyst_leaves_demoleave1" model="resource.calendar.leaves">
+	        <field name="name">2 Hours On Leave</field>
+	        <field name="resource_id" ref="resource_analyst"/>
 	        <field name="date_from" eval="time.strftime('%Y-%m-%d 08:00:00')"/>
 	        <field name="date_to" eval="time.strftime('%Y-%m-%d 11:00:00')"/>
 	        <field name="calendar_id" ref="timesheet_group1"/>
         </record>
 
-        <record id="resource_calendar_leaves_demoleave2" model="resource.calendar.leaves">
-	        <field name="name">Half Day Seak Leave</field>
-	        <field name="resource_id" ref="resource_resource_demorsource"/>
-	        <field name="date_from"  eval="time.strftime('%Y-%m-%d 14:00:00')"/>
-	        <field name="date_to" eval="time.strftime('%Y-%m-%d 18:00:00')"/>
-	        <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/resource/test/process/test_resource.yml b/addons/resource/test/process/test_resource.yml
deleted file mode 100644
index df9fd9e2708..00000000000
--- a/addons/resource/test/process/test_resource.yml
+++ /dev/null
@@ -1,25 +0,0 @@
--  |
-  In Order to Test resource : I use the 'Demo resource' from Demo Record, with 38 Hours / week and 9 Hours / Day working calendar scheduled.
--
-  First, I generate resource detail for the User "Demo"
--
-  !python {model: resource.resource}: |
-    res = self.generate_resources(cr, uid, [ref('base.user_demo')], ref('timesheet_group1'))
-    assert res, "Resource is not generated."
-    for resource in res.values():
-        assert resource.get('efficiency') == 0.8, "Wrong resource has been Generated"
-        assert resource.get('vacation'), 'No vaction calculated'
-
--
-  I compute the working calendar for the resource 'Demo Resource'.
--
-  !python {model: resource.resource}: |
-    res= self.compute_working_calendar(cr, uid, ref('timesheet_group1'))
-    assert res, "No working calendar generated for the resource 'Demo Resource'."
-
--
-  I compute vacation for the resource "Demo Resource" based on his Resource Leave Request(s).
--
-  !python {model: resource.resource}: |
-    res= self.compute_vacation(cr, uid, ref('timesheet_group1'), ref('resource_resource_demorsource'))
-    assert res, "No vacation generated for the resource 'Demo Resource'."
diff --git a/addons/resource/test/resource.yml b/addons/resource/test/resource.yml
index 7c117e74128..1fc2e1b19b9 100644
--- a/addons/resource/test/resource.yml
+++ b/addons/resource/test/resource.yml
@@ -1,5 +1,10 @@
--  | 
-  In order to test resource calendar, I use the Demo record '38 Hours/Week'.
+-
+  In order to test resource calendar.
+  I assign workig calendar '38 Hours/Week' to human resource.
+-
+  !python {model: resource.resource}: |    
+    self.write(cr, uid, [ref('resource_analyst'), ref('resource_designer'), ref('resource_developer')], {'calendar_id' : ref('timesheet_group1')})
+
 -
   I check the working hour on day for resource 'Demo Resource' using calendar '38 Hours/Week' .
 -
@@ -15,7 +20,7 @@
   !python {model: resource.calendar}: |
     from datetime import datetime
     dt = datetime.now()
-    result = self.interval_get(cr, uid, ref('timesheet_group1'), dt, 6.0, ref('resource_resource_demorsource'))
+    result = self.interval_get(cr, uid, ref('timesheet_group1'), dt, 6.0, ref('resource_analyst'))
     assert result, 'No Working Internal Timeming Generated'
     
 -
@@ -33,5 +38,5 @@
   !python {model: resource.calendar}: |
     from datetime import datetime, timedelta
     dt_from = datetime.now()
-    hours = self.interval_min_get(cr, uid, ref('timesheet_group1'), dt_from, 30.0, resource=ref('resource_resource_demorsource'))
+    hours = self.interval_min_get(cr, uid, ref('timesheet_group1'), dt_from, 30.0, resource=ref('resource_analyst'))
     assert hours, 'No Working Schedule Generated.'
diff --git a/addons/resource/test/ui/duplicate_resource.yml b/addons/resource/test/ui/duplicate_resource.yml
deleted file mode 100644
index 45f1f5aa28e..00000000000
--- a/addons/resource/test/ui/duplicate_resource.yml
+++ /dev/null
@@ -1,6 +0,0 @@
--
- I duplicate the resource "Demo resource"
--
-  !python {model: resource.resource}: |
-    copied_id = self.copy(cr, uid, ref("resource_resource_demorsource"))
-    assert copied_id, "Unablr to Duplicate Reousrce"
diff --git a/addons/resource/test/ui/on_change_resource.yml b/addons/resource/test/ui/on_change_resource.yml
deleted file mode 100644
index 821b3efa5e4..00000000000
--- a/addons/resource/test/ui/on_change_resource.yml
+++ /dev/null
@@ -1,6 +0,0 @@
--
-  I create resource calendar leave record to call event resource onchange event for "Demo Resource".
-- 
-  !record {model: resource.calendar.leaves, id: resource_calendar_leaves_demoleave1}:
-    calendar_id: resource.timesheet_group1
-    resource_id: resource.resource_resource_demorsource