diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 5566719a56d..ebc336caa72 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -819,49 +819,49 @@
     <record model="hr.attendance" id="unknown1_emp1">
         <field name="name" eval="time.strftime('%Y-%m-25 08:21')"/>
         <field name="action">sign_in</field>
-        <field name="employee_id" ref="hr.employee1" />
+        <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp2">
        <field name="name" eval="time.strftime('%Y-%m-25 9:21')"/>
        <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp3">
        <field name="name" eval="time.strftime('%Y-%m-25 09:25')"/>
        <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp4">
        <field name="name" eval="time.strftime('%Y-%m-25 11:54')"/>
        <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp5">
        <field name="name" eval="time.strftime('%Y-%m-25 11:59')"/>
        <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp6">
        <field name="name" eval="time.strftime('%Y-%m-25 13:31')"/>
        <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee1"/>
+       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <record model="hr.attendance" id="unknown1_emp7">
        <field name="name" eval="time.strftime('%Y-%m-25 20:10')"/>
        <field name="action">sign_in</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
     <record model="hr.attendance" id="unknown1_emp8">
        <field name="name" eval="time.strftime('%Y-%m-25 21:34')"/>
        <field name="action">sign_out</field>
-       <field name="employee_id" ref="hr.employee1" />
+       <field name="employee_id" ref="hr.employee_fp" />
     </record>
 
  <!--demo data for the hr_attendence for employee2-->
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index f478e099b87..b848951203f 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -5,121 +5,121 @@
         <record id="attendance1" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance2" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance3" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance4" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance5" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance6" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance7" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance8" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance9" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance10" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance11" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance12" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance13" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance14" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance15" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance16" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance17" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance18" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance19" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
 
         <record id="attendance20" model="hr.attendance">
             <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
         </record>
         
     </data>
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 304d7fac8af..88befbb1b3e 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -17,7 +17,7 @@
 -
   I check that Employee is "Present".
 -
-  !assert {model: hr.employee, id: hr.employee3, severity: error, string: Employee should be in present state}:
+  !assert {model: hr.employee, id: hr.employee_al, severity: error, string: Employee should be in present state}:
     - state == 'present'
 -
   I click on "Sign In" button of this wizard, this will Open a new form which ask for Last Sign Out date.
@@ -47,5 +47,5 @@
 -
   Finally i check the employee is present.
 -
-  !assert {model: hr.employee, id: hr.employee3, severity: error, string: Employee should be in present state}:
+  !assert {model: hr.employee, id: hr.employee_al, severity: error, string: Employee should be in present state}:
     - state == 'present'
diff --git a/addons/hr_attendance/test/hr_attendance_report.yml b/addons/hr_attendance/test/hr_attendance_report.yml
index d8f9c4cc29b..f9d78ebbecc 100644
--- a/addons/hr_attendance/test/hr_attendance_report.yml
+++ b/addons/hr_attendance/test/hr_attendance_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: hr.employee}: |
     from tools import test_reports
-    ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]}
+    ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]}
     data_dict = {}
     test_reports.try_report_action(cr, uid, 'action_hr_attendance_month',wiz_data=data_dict, context=ctx, our_module='hr_attendance')
 -
@@ -12,6 +12,6 @@
   !python {model: hr.employee}: |
     import time
     from tools import test_reports
-    ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee1')]}
+    ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee_fp')]}
     data_dict = {'init_date': time.strftime('%Y-01-01')}
     test_reports.try_report_action(cr, uid, 'action_hr_attendance_error',wiz_data=data_dict, context=ctx, our_module='hr_attendance')
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 6fc31170396..ed39d5b03e5 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -2,21 +2,21 @@
 <openerp>
     <data noupdate="1">
 
-    	<record id="hr.employee1" model="hr.employee">
+    	<record id="hr.employee_fp" model="hr.employee">
             <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
 
-        <record id="hr.employee2" model="hr.employee">
+        <record id="hr.employee_qdp" model="hr.employee">
             <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
 
-        <record id="hr.employee3" model="hr.employee">
+        <record id="hr.employee_al" model="hr.employee">
             <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
 
         <record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
             <field name="date">2011-12-24</field>
-            <field name="employee_id" ref="hr.employee1"/>
+            <field name="employee_id" ref="hr.employee_fp"/>
             <field name="plan_id" ref="hr_evaluation.hr_evaluation_plan_managersevaluationplan0"/>
         </record>
 
diff --git a/addons/hr_evaluation/test/hr_evalution_demo.yml b/addons/hr_evaluation/test/hr_evalution_demo.yml
index 817be623901..8c62969dea6 100644
--- a/addons/hr_evaluation/test/hr_evalution_demo.yml
+++ b/addons/hr_evaluation/test/hr_evalution_demo.yml
@@ -1,5 +1,5 @@
 -
-  !record {model: hr.employee, id: hr.employee1, view: False}:
+  !record {model: hr.employee, id: hr.employee_fp, view: False}:
     evaluation_plan_id: hr_evaluation_plan_managersevaluationplan0
 -
   !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, view: False}:
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 8875a83120d..2bdc3513962 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -103,6 +103,6 @@
   !python {model: hr.evaluation.report}: |
     import netsvc, tools, os, time
     ctx={}
-    data_dict={'state': 'done', 'rating': 2, 'employee_id': ref("hr.employee1")}
+    data_dict={'state': 'done', 'rating': 2, 'employee_id': ref("hr.employee_fp")}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'hr_evaluation_evaluation_0',wiz_data=data_dict, context=ctx, our_module='hr_evaluation')
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 8912dfb09de..8f0e2c843b2 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="hr.employee4" model="hr.employee">
+        <record id="hr.employee_mit" model="hr.employee">
             <field name="address_home_id" ref="base.res_partner_address_1"/>
         </record>
 
@@ -47,7 +47,7 @@
         </record>
 
         <record id="sep_expenses" model="hr.expense.expense">
-            <field name="employee_id" ref="hr.employee4"/>
+            <field name="employee_id" ref="hr.employee_mit"/>
             <field name="name">September Expenses</field>
             <field name="date" eval="time.strftime('%Y-09-28')"/>
         </record>
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index 5b3cb0893d0..06ea4265a1f 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -1,6 +1,6 @@
 -
   !record {model: hr.expense.expense, id: sep_expenses}:
-    employee_id: hr.employee4
+    employee_id: hr.employee_mit
     name : 'John Smith'
 -
   !record {model: product.product, id: car_travel}:
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index abd95ca3027..6ad5a442a38 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -7,7 +7,7 @@
         <field name="holiday_status_id" ref="holiday_status_cl"/>
         <field name="type">add</field>
         <field name="number_of_days_temp">20</field>
-        <field name="employee_id" ref="hr.employee1"/>
+        <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
@@ -17,7 +17,7 @@
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
       <field name="number_of_days_temp">3</field>
-      <field name="employee_id" ref="hr.employee1"/>
+      <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <record model="hr.holidays" id="hr_holidays_employee1_sl">
@@ -28,7 +28,7 @@
       <field name="type">remove</field>
       <field name="state">draft</field>
       <field name="number_of_days_temp">3</field>
-      <field name="employee_id" ref="hr.employee1"/>
+      <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <record model="hr.holidays" id="hr_holidays_employee1_vc">
@@ -39,7 +39,7 @@
       <field name="type">add</field>
       <field name="state">draft</field>
       <field name="number_of_days_temp">7</field>
-      <field name="employee_id" ref="hr.employee1"/>
+      <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <record model="hr.holidays" id="hr_holidays_employee1_int_tour">
@@ -49,7 +49,7 @@
       <field eval="time.strftime('%Y-%m-22')" name="date_to"/>
       <field name="type">add</field>
       <field name="number_of_days_temp">7</field>
-      <field name="employee_id" ref="hr.employee1"/>
+      <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
     <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
index bc0b4efa51f..29b6b8c36cd 100644
--- a/addons/hr_holidays/test/hr_holidays_report.yml
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -4,7 +4,7 @@
   !python {model: hr.holidays}: |
     import time
     ctx={}
-    ctx.update({'model': 'hr.department','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    ctx.update({'model': 'hr.department','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
     data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Validated'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_dept',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
@@ -15,8 +15,8 @@
   !python {model: hr.holidays}: |
     import time
     ctx={}
-    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
-    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')])],'holiday_type' : 'Validated'}
+    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])],'holiday_type' : 'Validated'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_employee',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
 
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index af476386e0b..9228a7a381e 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -8,7 +8,7 @@
     holiday_status_id: holiday_status_cl
     date_from: !eval time.strftime('%Y-%m-10 10:00:00')
     date_to: !eval time.strftime('%Y-%m-11 19:00:00')
-    employee_id: hr.employee1
+    employee_id: hr.employee_fp
     type: remove
 -
   I confirmed the holiday request by clicking on "Confirm" button.
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 7d670d6cafa..36ac3e23a7b 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -155,7 +155,7 @@
             <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
             <field name="date_end" eval="time.strftime('%Y')+'-12-31'"/>
             <field name="struct_id" ref="hr_payroll.structure_002"/>
-            <field name="employee_id" ref="hr.employee2"/>
+            <field name="employee_id" ref="hr.employee_qdp"/>
             <field name="notes">This is Quentin Paolino's contract</field>
             <field eval="5000.0" name="wage"/>
             <field name="working_hours" ref="resource.timesheet_group1"/>
diff --git a/addons/hr_payroll_account/hr_payroll_account_demo.xml b/addons/hr_payroll_account/hr_payroll_account_demo.xml
index ed6371a6f4d..12dc92332c6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_demo.xml
@@ -52,19 +52,19 @@
             <field name="employee_account" ref="account.a_expense"/>
         </record>
 
-        <record id="hr.employee1" model="hr.employee">
+        <record id="hr.employee_fp" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
         </record>
 
-        <record id="hr.employee2" model="hr.employee">
+        <record id="hr.employee_qdp" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
         </record>
 
-        <record id="hr.employee3" model="hr.employee">
+        <record id="hr.employee_al" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f6f2729c4d4..3ec7664bcb7 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -8,7 +8,7 @@
         </record>
 
         <!-- complete our example employee -->
-        <record id="hr.employee1" model="hr.employee">
+        <record id="hr.employee_fp" model="hr.employee">
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 5005c5d724d..097bf764429 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os, time
     ctx={}
     ctx.update({'model': 'hr.employee','active_ids': []})
-    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee1')}
+    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee_fp')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_timesheet_my',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
 
@@ -16,6 +16,6 @@
     import netsvc, tools, os, time
     ctx={}
     ctx.update({'model': 'hr.employee','active_ids': []})
-    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')])]}
+    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])]}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
\ No newline at end of file
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 19c72a46d2b..420dfc667b5 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -4,17 +4,17 @@
 -
   I create employee "Quentin Paolino" as "User".
 -
-  !record {model: hr.employee, id: hr.employee2}:
+  !record {model: hr.employee, id: hr.employee_qdp}:
     address_home_id: base.res_partner_address_8
     name: Quentin Paolino
-    parent_id: 'hr.employee3'
+    parent_id: 'hr.employee_al'
     user_id: 'base.user_demo'
 -
   On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.
 -
   !python {model: hr.sign.in.project}: |
     uid = ref('base.user_demo')
-    state_id = self.check_state(cr, uid, [ref("hr.employee2")], {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]})
+    state_id = self.check_state(cr, uid, [ref("hr.employee_qdp")], {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")]})
     assert state_id['name'] == 'Sign in / Sign out', "Check the process of sing-in/sing-out."
 -
   I select start date and Perform start work on project.
@@ -22,7 +22,7 @@
   !python {model: hr.sign.in.project}: |
     import time
     uid = ref('base.user_demo')
-    new_id = self.create(cr, uid, {'emp_id': ref('hr.employee2'), 'name': 'Quentin Paolino',
+    new_id = self.create(cr, uid, {'emp_id': ref('hr.employee_qdp'), 'name': 'Quentin Paolino',
     'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
     self.sign_in_result(cr, uid, [new_id], context)
 -
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index 886bb89b5b7..2340d18e3f8 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: account.analytic.line}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee1'), ref('hr.employee2'),ref('hr.employee3')]]], 'journal_ids': [[6,0,[ref('hr_timesheet.analytic_journal')]]], 'date_to': time.strftime('%Y-%m-%d')}}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'employee_ids': [[6,0,[ref('hr.employee_fp'), ref('hr.employee_qdp'),ref('hr.employee_al')]]], 'journal_ids': [[6,0,[ref('hr_timesheet.analytic_journal')]]], 'date_to': time.strftime('%Y-%m-%d')}}
     (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index 3ffa2cf0d1a..a73bbb3050e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -5,7 +5,7 @@
         <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="employee_id" ref="hr.employee1" />
+            <field name="employee_id" ref="hr.employee_fp" />
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
 
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 1cb97ca8afd..f6d78dca013 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -4,7 +4,7 @@
 -
   I assign this product(Service on Timesheet) and journal(Timesheet Journal) to employee "Quentin Paolino"
 -
-  !record {model: hr.employee, id: hr.employee2}:
+  !record {model: hr.employee, id: hr.employee_qdp}:
     product_id: product.product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
@@ -16,7 +16,7 @@
     name: Quentin Paolinon
     state: new
     user_id: base.user_demo
-    employee_id: 'hr.employee2'
+    employee_id: 'hr.employee_qdp'
 -
   Now, at the time of login, I create Attendances and perform "Sign In" action.
 -
@@ -54,7 +54,7 @@
 -
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
-    employee_id: 'hr.employee2'
+    employee_id: 'hr.employee_qdp'
     name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(min(23,datetime.now().hour+2),min(59,datetime.now().minute+1),min(59,datetime.now().second+1))
 -
   I create Timesheet Entry for time spend on today work.
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 8c3f4e2b72a..1b9c2e5897b 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -2,19 +2,19 @@
 <openerp>
     <data noupdate="1">
         <!-- Example employee -->
-        <record id="hr.employee2" model="hr.employee">
+        <record id="hr.employee_qdp" model="hr.employee">
             <field name="user_id" ref="project.res_users_technical_leader"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
-        <record id="hr.employee3" model="hr.employee">
+        <record id="hr.employee_al" model="hr.employee">
             <field name="user_id" ref="project.res_users_project_manager"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
-        <record id="hr.employee4" model="hr.employee">
+        <record id="hr.employee_mit" model="hr.employee">
             <field name="name">Phuong</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_analyst"/>
@@ -23,7 +23,7 @@
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
-        <record id="hr.employee5" model="hr.employee">
+        <record id="hr.employee_fpi" model="hr.employee">
             <field name="name">Francois</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_developer"/>
@@ -31,7 +31,7 @@
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
-        <record id="hr.employee6" model="hr.employee">
+        <record id="hr.employee_jth" model="hr.employee">
             <field name="name">Julien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="user_id" ref="project.res_users_designer"/>