diff --git a/base_delivery_carrier_files/__manifest__.py b/base_delivery_carrier_files/__manifest__.py
index 1ac44d8b6a..c94f6813a2 100644
--- a/base_delivery_carrier_files/__manifest__.py
+++ b/base_delivery_carrier_files/__manifest__.py
@@ -14,14 +14,16 @@
         'stock',
         'delivery'
     ],
+    'demo': [
+        'demo/carrier_file_data.xml',
+    ],
     'data': [
         'views/carrier_file_view.xml',
         'views/stock_view.xml',
         'wizards/generate_carrier_files_view.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
     ],
     'summary': 'Base module for creation of delivery carrier files',
-    'images': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/base_delivery_carrier_files/demo/carrier_file_data.xml b/base_delivery_carrier_files/demo/carrier_file_data.xml
new file mode 100644
index 0000000000..b4fac3b691
--- /dev/null
+++ b/base_delivery_carrier_files/demo/carrier_file_data.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="delivery_carrier_file" model="delivery.carrier.file">
+        <field name="name">Generic</field>
+        <field name="type">generic</field>
+        <field name="auto_export" eval="True"/>
+        <field name="group_pickings" eval="False"/>
+        <field name="write_mode">disk</field>
+        <field name="export_path">/tmp</field>
+    </record>
+
+    <record id="delivery_carrier_file_manual" model="delivery.carrier.file">
+        <field name="name">Generic Manual</field>
+        <field name="type">generic</field>
+        <field name="auto_export" eval="False"/>
+        <field name="group_pickings" eval="True"/>
+        <field name="write_mode">disk</field>
+        <field name="export_path">/tmp</field>
+    </record>
+
+    <record id="delivery.delivery_carrier" model="delivery.carrier">
+        <field name="carrier_file_id" ref="delivery_carrier_file"/>
+    </record>
+
+    <record id="delivery.free_delivery_carrier" model="delivery.carrier">
+        <field name="carrier_file_id" ref="delivery_carrier_file_manual"/>
+    </record>
+
+    <record id="location_refrigerator" model="stock.location">
+        <field name="name">Refrigerator</field>
+        <field name="usage">internal</field>
+    </record>
+
+    <record id="location_delivery_counter" model="stock.location">
+        <field name="name">Delivery Counter</field>
+        <field name="usage">internal</field>
+    </record>
+
+    <record id="location_opening" model="stock.location">
+        <field name="name">opening</field>
+        <field name="usage">inventory</field>
+    </record>
+
+    <record id="stock.product_icecream" model="product.product">
+        <field name="property_stock_inventory" ref="base_delivery_carrier_files.location_opening"/>
+    </record>
+
+    <record id="outgoing_shipment_type_carrier_file" model="stock.picking.type">
+        <field name="name">Outgoing Ice Cream</field>
+        <field name="code">outgoing</field>
+        <field name="sequence_id" ref="stock.sequence_mrp_op"/>
+    </record>
+
+    <record id="outgoing_shipment_carrier_file" model="stock.picking">
+        <field name="picking_type_id" ref="base_delivery_carrier_files.outgoing_shipment_type_carrier_file"/>
+        <field name="location_id" ref="base_delivery_carrier_files.location_refrigerator"/>
+        <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
+        <field name="carrier_id" ref="delivery.delivery_carrier"/>
+    </record>
+
+    <record id="outgoing_shipment_icecream_carrier_file" model="stock.move">
+        <field name="name">Outgoing Ice Cream Move</field>
+        <field name="picking_id" ref="base_delivery_carrier_files.outgoing_shipment_carrier_file"/>
+        <field name="product_id" ref="stock.product_icecream"/>
+        <field name="product_uom" ref="product.product_uom_kgm"/>
+        <field name="product_uom_qty">130.0</field>
+        <field name="location_id" ref="base_delivery_carrier_files.location_refrigerator"/>
+        <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
+    </record>
+
+    <record id="outgoing_shipment_carrier_file_manual" model="stock.picking">
+        <field name="picking_type_id" ref="base_delivery_carrier_files.outgoing_shipment_type_carrier_file"/>
+        <field name="location_id" ref="base_delivery_carrier_files.location_refrigerator"/>
+        <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
+        <field name="carrier_id" ref="delivery.free_delivery_carrier"/>
+    </record>
+
+    <record id="outgoing_shipment_icecream_carrier_file" model="stock.move">
+        <field name="name">Outgoing Ice Cream Move Manual</field>
+        <field name="picking_id" ref="base_delivery_carrier_files.outgoing_shipment_carrier_file_manual"/>
+        <field name="product_id" ref="stock.product_icecream"/>
+        <field name="product_uom" ref="product.product_uom_kgm"/>
+        <field name="product_uom_qty">130.0</field>
+        <field name="location_id" ref="base_delivery_carrier_files.location_refrigerator"/>
+        <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
+    </record>
+
+</odoo>
diff --git a/base_delivery_carrier_files/test/carrier_file_test_data.xml b/base_delivery_carrier_files/test/carrier_file_test_data.xml
deleted file mode 100644
index c906f39348..0000000000
--- a/base_delivery_carrier_files/test/carrier_file_test_data.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="0">
-
-        <!-- Carrier File -->
-
-         <record id="delivery_carrier_file" model="delivery.carrier.file">
-             <field name="name">Generic</field>
-             <field name="type">generic</field>
-             <field name="auto_export" eval="True"/>
-             <field name="group_pickings" eval="False"/>
-             <field name="write_mode">disk</field>
-             <field name="export_path">/tmp</field>
-         </record>
-
-        <record id="delivery_carrier_file_manual" model="delivery.carrier.file">
-            <field name="name">Generic Manual</field>
-            <field name="type">generic</field>
-            <field name="auto_export" eval="False"/>
-            <field name="group_pickings" eval="True"/>
-            <field name="write_mode">disk</field>
-            <field name="export_path">/tmp</field>
-        </record>
-
-        <!-- Assign the carrier files on the delivery method -->
-
-        <record id="delivery.delivery_carrier" model="delivery.carrier">
-            <field name="carrier_file_id" ref="delivery_carrier_file"/>
-        </record>
-
-        <record id="delivery.free_delivery_carrier" model="delivery.carrier">
-            <field name="carrier_file_id" ref="delivery_carrier_file_manual"/>
-        </record>
- 
-        <record id="location_refrigerator" model="stock.location">
-            <field name="Refrigerator"/>
-            <field usage="internal"/>
-        </record>
-
-        <record id="location_delivery_counter" model="stock.location">
-            <field name="name">Delivery Counter</field>
-            <field name="usage">internal</field>
-        </record>
-
-        <record id="location_opening" model="stock.location">
-            <field name="name">opening</field>
-            <field name="usage">inventory</field>
-        </record>
-
-        <record id="product_icecream" model="product.product">
-            <field name="default_code">001</field>
-            <field name="name">Ice Cream</field>
-            <field name="type">product</field>
-            <field name="categ_id" ref="product.product_category_1"/>
-            <field name="list_price">100.0</field>
-            <field name="standard_price">70.0</field>
-            <field name="uom_id" ref="product.product_uom_kgm"/>
-            <field name="uom_po_id" ref="product.product_uom_kgm"/>
-            <field name="property_stock_inventory" ref="base_delivery_carrier_files.location_opening"/>
-            <field name="valuation">real_time</field>
-            <field name="cost_method">average</field>
-            <field name="property_stock_account_input" ref="account.o_expense"/>
-            <field name="property_stock_account_output" ref="account.o_income"/>
-        </record>
-
-        <record id="outgoing_shipment_type_carrier_file" model="stock.picking.type">
-            <field name="name">Outgoing Ice Cream</field>
-            <field name="code">outgoing</field>
-            <field name="sequence_id" ref="stock.sequence_mrp_op"/>
-        </record> 
-
-        <record id="outgoing_shipment_carrier_file" model="stock.picking">
-            <field name="picking_type_id" ref="base_delivery_carrier_files.outgoing_shipment_type_carrier_file"/>
-            <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
-            <field name="carrier_id" ref="delivery.delivery_carrier"/>
-        </record> 
-
-        <record id="outgoing_shipment_icecream_carrier_file" model="stock.move">
-            <field name="picking_id" ref="base_delivery_carrier_files.outgoing_shipment_icecream_carrier_file"/>
-            <field name="product_id" ref="base_delivery_carrier_files.product_icecream"/>
-            <field name="product_uom" ref="product.product_uom_kgm"/>
-            <field name="product_uom_qty">130.0</field>
-            <field name="location_id" ref="base_delivery_carrier_files.location_refrigerator"/>
-            <field name="location_dest_id" ref="base_delivery_carrier_files.location_delivery_counter"/>
-        </record> 
-<!-- !record {model: stock.picking.type, id: outgoing_shipment_type_carrier_file_manual}:
-    name: Outgoing Ice Cream 
-    code: outgoing
-    sequence_id: stock.sequence_mrp_op
--
- !record {model: stock.picking, id: outgoing_shipment_carrier_file_manual}:
-    picking_type_id: outgoing_shipment_type_carrier_file_manual
-    location_dest_id: location_delivery_counter
-    carrier_id: delivery.free_delivery_carrier
--
- !record {model: stock.move, id: outgoing_shipment_icecream_carrier_file_manual}:
-    picking_id: outgoing_shipment_carrier_file_manual
-    product_id: product_icecream
-    product_uom: product.product_uom_kgm
-    product_uom_qty: 130.0
-    location_id: location_refrigerator
-    location_dest_id: location_delivery_counter -->
-    </data>
-</odoo>
diff --git a/base_delivery_carrier_files/tests/test_base_delivery_carrier_files.py b/base_delivery_carrier_files/tests/test_base_delivery_carrier_files.py
index 84fe889ba3..f4034496a2 100644
--- a/base_delivery_carrier_files/tests/test_base_delivery_carrier_files.py
+++ b/base_delivery_carrier_files/tests/test_base_delivery_carrier_files.py
@@ -5,16 +5,11 @@
 
 import tempfile
 
-from openerp.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase
 
 
 class CarrierFilesTest(TransactionCase):
 
-    def setUp(self):
-        super(CarrierFilesTest, self).setUp()
-        self._load('account', 'test', 'account_minimal_test.xml')
-        self._load('base_delivery_carrier_files', 'test', 'carrier_file_test_data.xml')
-
     def test_carrier_file_generation(self):
         """ Test carrier file generation """
         # I configure the carrier file configuration
@@ -26,11 +21,6 @@ def test_carrier_file_generation(self):
             'write_mode': 'disk'
         })
 
-        # I set the carrier file configuration on the carrier
-        # 'Free delivery charges'
-        carrier = self.env.ref('delivery.delivery_carrier')
-        carrier.carrier_file_id = carrier_file.id
-
         # I confirm outgoing shipment of 130 kgm Ice-cream.
         picking = self.env.ref(
             'base_delivery_carrier_files.outgoing_shipment_carrier_file')
@@ -40,14 +30,7 @@ def test_carrier_file_generation(self):
         picking.force_assign()
 
         # I deliver outgoing shipment.
-        wizard = self.env['stock.transfer_details'].with_context({
-            'active_model': 'stock.picking',
-            'active_id': picking.id,
-            'active_ids': picking.ids
-        }).create({
-            'picking_id': picking.id
-        })
-        wizard.do_detailed_transfer()
+        picking.do_transfer()
 
         # I check shipment details after shipment
         # The carrier file must have been generated.
@@ -63,17 +46,12 @@ def test_manual_carrier_file_generation(self):
         # I configure the carrier file configuration
         # to write to the root document directory.
         carrier_file = self.env.ref(
-            'base_delivery_carrier_files.delivery_carrier_file')
+            'base_delivery_carrier_files.delivery_carrier_file_manual')
         carrier_file.write({
             'export_path': tempfile.gettempdir(),
             'write_mode': 'disk'
         })
 
-        # I set the carrier file configuration on the carrier
-        # 'Free delivery charges'
-        carrier = self.env.ref('delivery.delivery_carrier')
-        carrier.carrier_file_id = carrier_file.id
-
         # I confirm outgoing shipment of 130 kgm Ice-cream.
         picking = self.env.ref(
             'base_delivery_carrier_files'
@@ -84,14 +62,7 @@ def test_manual_carrier_file_generation(self):
         picking.force_assign()
 
         # I deliver outgoing shipment.
-        wizard = self.env['stock.transfer_details'].with_context({
-            'active_model': 'stock.picking',
-            'active_id': picking.id,
-            'active_ids': picking.ids
-        }).create({
-            'picking_id': picking.id
-        })
-        wizard.do_detailed_transfer()
+        picking.do_transfer()
 
         # I check shipment details after shipment
         # The carrier file must NOT have been generated.
diff --git a/base_delivery_carrier_files/views/carrier_file_view.xml b/base_delivery_carrier_files/views/carrier_file_view.xml
index 622ecf7075..b637ea02f4 100644
--- a/base_delivery_carrier_files/views/carrier_file_view.xml
+++ b/base_delivery_carrier_files/views/carrier_file_view.xml
@@ -18,17 +18,16 @@
         <field name="model">delivery.carrier.file</field>
         <field name="arch" type="xml">
             <form string="Carrier File">
-                <group colspan="4" col="4" name="general">
-                    <field name="name" select="1"/>
-                    <field name="type" select="1"/>
-                    <field name="auto_export"/>
-                    <field name="group_pickings"/>
-                    <separator string="Write options" colspan="4"/>
-                    <group colspan="4" col="4">
+                <group name="general">
+                    <group>
+                        <field name="name" select="1"/>
+                        <field name="type" select="1"/>
+                        <field name="auto_export"/>
+                        <field name="group_pickings"/>
+                    </group>
+                    <group string="Write options">
                         <field name="write_mode"/>
-                        <group colspan="2" col="2">
-                            <field name="export_path" attrs="{'required': [('write_mode', '=', 'disk')], 'invisible': [('write_mode', '!=', 'disk')]}"/>
-                        </group>
+                        <field name="export_path" attrs="{'required': [('write_mode', '=', 'disk')], 'invisible': [('write_mode', '!=', 'disk')]}"/>
                     </group>
                 </group>
             </form>
diff --git a/base_delivery_carrier_files_document/demo/carrier_file_demo.xml b/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
index 2f602ad865..d528b61f9a 100644
--- a/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
+++ b/base_delivery_carrier_files_document/demo/carrier_file_demo.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
 
-        <!-- Carrier File -->
-        <record id="base_delivery_carrier_files.delivery_carrier_file" model="delivery.carrier.file">
-            <field name="name">Automatic carrier file</field>
-            <field name="write_mode">document</field>
-            <field name="type">generic</field>
-        </record>
+    <!-- Carrier File -->
+    <record id="base_delivery_carrier_files.delivery_carrier_file" model="delivery.carrier.file">
+        <field name="write_mode">document</field>
+        <field name="type">generic</field>
+    </record>
 
-        <record id="base_delivery_carrier_files.delivery_carrier_file_manual" model="delivery.carrier.file">
-            <field name="name">Manual carrier file</field>
-            <field name="write_mode">document</field>
-            <field name="type">generic</field>
-        </record>
+    <record id="base_delivery_carrier_files.delivery_carrier_file_manual" model="delivery.carrier.file">
+        <field name="write_mode">document</field>
+        <field name="type">generic</field>
+    </record>
 
-    </data>
 </odoo>
diff --git a/base_delivery_carrier_files_document/models/delivery_carrier_file.py b/base_delivery_carrier_files_document/models/delivery_carrier_file.py
index 00141c15b2..0cd82f2b55 100644
--- a/base_delivery_carrier_files_document/models/delivery_carrier_file.py
+++ b/base_delivery_carrier_files_document/models/delivery_carrier_file.py
@@ -5,7 +5,7 @@
 
 import base64
 
-from openerp import api, models, fields
+from openerp import api, models
 
 
 class DeliveryCarrierFile(models.Model):
diff --git a/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py b/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py
index 3825caa3dd..32f1744ca7 100644
--- a/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py
+++ b/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py
@@ -30,67 +30,13 @@ def test_carrier_file_generation(self):
         picking.force_assign()
 
         # I deliver outgoing shipment.
-        wizard = self.env['stock.transfer_details'].with_context({
-            'active_model': 'stock.picking',
-            'active_id': picking.id,
-            'active_ids': picking.ids
-        }).create({
-            'picking_id': picking.id
-        })
-        wizard.do_detailed_transfer()
+        domain = [('datas_fname', '=ilike', '%.csv')]
+        count_before = self.env['ir.attachment'].search_count(domain)
+        picking.do_transfer()
+        count_after = self.env['ir.attachment'].search_count(domain)
 
         # I check shipment details after shipment
         # The carrier file must have been generated.
         self.assertTrue(picking.carrier_file_generated)
-
-        # I check outgoing shipment copy
-        # The carrier_file_generated field must be unchecked.
-        new_picking = picking.copy()
-        self.assertFalse(new_picking.carrier_file_generated)
-
-    def test_manual_carrier_file_generation(self):
-        """ Test manual carrier file generation """
-        carrier_file = self.env.ref(
-            'base_delivery_carrier_files.delivery_carrier_file_manual')
-
-        # Save as attachment
-        carrier_file.write({'write_mode': 'document'})
-
-        # I set the carrier file configuration on the carrier
-        # 'Free delivery charges'
-        carrier = self.env.ref('delivery.delivery_carrier')
-        carrier.carrier_file_id = carrier_file.id
-
-        # I confirm outgoing shipment of 130 kgm Ice-cream.
-        picking = self.env.ref(
-            'base_delivery_carrier_files'
-            '.outgoing_shipment_carrier_file_manual')
-        picking.action_confirm()
-
-        # I check outgoing shipment after stock availablity in refrigerator.
-        picking.force_assign()
-
-        # I deliver outgoing shipment.
-        wizard = self.env['stock.transfer_details'].with_context({
-            'active_model': 'stock.picking',
-            'active_id': picking.id,
-            'active_ids': picking.ids
-        }).create({
-            'picking_id': picking.id
-        })
-        wizard.do_detailed_transfer()
-
-        # I check shipment details after shipment
-        # The carrier file must NOT have been generated.
-        self.assertFalse(picking.carrier_file_generated)
-
-        # I generate the carrier files of my shipment from the wizard
-        wizard = self.env['delivery.carrier.file.generate'].with_context({
-            'active_ids': picking.ids,
-            'active_model': 'stock.picking'
-        }).create({})
-        wizard.action_generate()
-
-        # I check shipment details after manual generation
-        # The carrier file must have been generated.
-        self.assertTrue(picking.carrier_file_generated)
+        # The carrier file attachment must be there
+        self.assertEquals(count_after - count_before, 1)
diff --git a/base_delivery_carrier_files_document/views/carrier_file_view.xml b/base_delivery_carrier_files_document/views/carrier_file_view.xml
deleted file mode 100644
index 1dc55e51b9..0000000000
--- a/base_delivery_carrier_files_document/views/carrier_file_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_delivery_carrier_file_form_document" model="ir.ui.view">
-        <field name="name">delivery.carrier.file.form</field>
-        <field name="model">delivery.carrier.file</field>
-        <field name="inherit_id" ref="base_delivery_carrier_files.view_delivery_carrier_file_form"/>
-        <field name="arch" type="xml">
-            <data>
-                <field name="export_path" position="after">
-                    <field name="document_directory_id" attrs="{'required': [('write_mode', '=', 'document')], 'invisible': [('write_mode', '!=', 'document')]}"/>
-                </field>
-            </data>
-        </field>
-    </record>
-</odoo>