diff --git a/install-new/fixtures/apple/data/address.xml b/install-new/fixtures/apple/data/address.xml
index f86b94214..85d56f8ff 100644
--- a/install-new/fixtures/apple/data/address.xml
+++ b/install-new/fixtures/apple/data/address.xml
@@ -23,7 +23,7 @@
     <field name="active"/>
   </fields>
   <entities>
-    <address id="manufacturer" id_country="US" id_state="state_5" id_customer="" id_manufacturer="Apple_Computer_Inc" id_supplier="" id_warehouse="0" alias="manufacturer" company="" lastname="JOBS" firstname="STEVE" postcode="95014" phone="(800) 275-2273" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="manufacturer" id_country="US" id_state="" id_customer="" id_manufacturer="Apple_Computer_Inc" id_supplier="" id_warehouse="0" alias="manufacturer" company="" lastname="JOBS" firstname="STEVE" postcode="95014" phone="(800) 275-2273" phone_mobile="" vat_number="" dni="" active="1">
       <address1>1 Infinite Loop</address1>
       <address2/>
       <city>Cupertino</city>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
index d370c1bfd..55293ca77 100644
--- a/install-new/fixtures/apple/data/customer.xml
+++ b/install-new/fixtures/apple/data/customer.xml
@@ -19,7 +19,7 @@
     <field name="is_guest"/>
   </fields>
   <entities>
-    <customer id="John" id_gender="gender_1" id_default_group="3" firstname="John" lastname="DOE" passwd="57d7eb4436e6ba5ae8f95ee8b0f7e46a" last_passwd_gen="2012-01-02 05:00:33" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="702c16f53b5f9c4353628705cc5759e7" active="1" is_guest="0">
+    <customer id="John" id_gender="" id_default_group="3" firstname="John" lastname="DOE" passwd="291ef87dd3531037a5f81c19036f2510" last_passwd_gen="2012-01-02 05:14:05" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="ec04c88d18dc5f8d86ff2a3754daa421" active="1" is_guest="0">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>
diff --git a/install-new/fixtures/apple/data/guest.xml b/install-new/fixtures/apple/data/guest.xml
index 28af6bd6f..aa10458f4 100644
--- a/install-new/fixtures/apple/data/guest.xml
+++ b/install-new/fixtures/apple/data/guest.xml
@@ -17,6 +17,6 @@
     <field name="accept_language"/>
   </fields>
   <entities>
-    <guest id="guest_1" id_operating_system="operating_system_1" id_web_browser="web_browser_3" id_customer="John" javascript="1" screen_resolution_x="1680" screen_resolution_y="1050" screen_color="32" sun_java="1" adobe_flash="1" adobe_director="0" apple_quicktime="1" real_player="1" windows_media="0" accept_language="en-us"/>
+    <guest id="guest_1" id_operating_system="" id_web_browser="" id_customer="John" javascript="1" screen_resolution_x="1680" screen_resolution_y="1050" screen_color="32" sun_java="1" adobe_flash="1" adobe_director="0" apple_quicktime="1" real_player="1" windows_media="0" accept_language="en-us"/>
   </entities>
 </entity_guest>
diff --git a/install-new/fixtures/apple/data/orders.xml b/install-new/fixtures/apple/data/orders.xml
index 8334205d1..7dfc66a9e 100644
--- a/install-new/fixtures/apple/data/orders.xml
+++ b/install-new/fixtures/apple/data/orders.xml
@@ -2,6 +2,8 @@
 <entity_orders>
   <fields primary="id_order" class="Order">
     <field name="reference"/>
+    <field name="id_group_shop"/>
+    <field name="id_shop"/>
     <field name="id_carrier" relation="carrier"/>
     <field name="id_customer" relation="customer"/>
     <field name="id_cart" relation="cart"/>
@@ -38,7 +40,7 @@
     <field name="valid"/>
   </fields>
   <entities>
-    <orders id="orders_1" reference="XKBKNABJ" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
+    <orders id="orders_1" reference="XKBKNABJ" id_group_shop="1" id_shop="1" id_carrier="My_carrier" id_customer="John" id_cart="cart_1" id_currency="1" id_address_delivery="Mon_adresse" id_address_invoice="Mon_adresse" secure_key="47ce86627c1f3c792a80773c5d2deaf8" conversion_rate="1.000000" recyclable="0" gift="0" shipping_number="" total_discounts="0.00" total_discounts_tax_incl="0.00" total_paid="626.37" total_paid_tax_incl="626.37" total_paid_tax_excl="523.72" total_paid_real="626.37" total_products="516.72" total_products_wt="618.00" total_shipping="7.98" total_shipping_tax_incl="8.37" total_shipping_tax_excl="7.00" carrier_tax_rate="19.600" total_wrapping="0.00" total_wrapping_tax_incl="0.00" total_wrapping_tax_excl="0.00" invoice_number="0" delivery_number="0" invoice_date="0000-00-00 00:00:00" delivery_date="0000-00-00 00:00:00" valid="0">
       <payment>Chèque</payment>
       <module>cheque</module>
       <gift_message/>
diff --git a/install-new/fixtures/apple/data/store.xml b/install-new/fixtures/apple/data/store.xml
index f4ec91959..e59814abc 100644
--- a/install-new/fixtures/apple/data/store.xml
+++ b/install-new/fixtures/apple/data/store.xml
@@ -49,7 +49,7 @@
       <name>Coconut Grove</name>
       <address1>2999 SW 32nd Avenue</address1>
       <address2/>
-      <city> Miami</city>
+      <city>Miami</city>
       <hours>a:7:{i:0;s:13:"09:00 - 19:00";i:1;s:13:"09:00 - 19:00";i:2;s:13:"09:00 - 19:00";i:3;s:13:"09:00 - 19:00";i:4;s:13:"09:00 - 19:00";i:5;s:13:"10:00 - 16:00";i:6;s:13:"10:00 - 16:00";}</hours>
       <email/>
       <note/>