diff --git a/website_portal_contract/__manifest__.py b/website_portal_contract/__manifest__.py
index 056775ab..d321003f 100644
--- a/website_portal_contract/__manifest__.py
+++ b/website_portal_contract/__manifest__.py
@@ -26,9 +26,10 @@
         "views/website_portal_contract_templates.xml",
     ],
     "demo": [
-        "demo/account_analytic_invoice_line_demo.xml",
+        # Load order must be `contract => account => invoice line`
         "demo/account_analytic_contract_demo.xml",
         "demo/account_analytic_account_demo.xml",
+        "demo/account_analytic_invoice_line_demo.xml",
         "demo/assets_demo.xml",
     ],
 }
diff --git a/website_portal_contract/demo/account_analytic_account_demo.xml b/website_portal_contract/demo/account_analytic_account_demo.xml
index 23d5ac49..3b8d01a8 100644
--- a/website_portal_contract/demo/account_analytic_account_demo.xml
+++ b/website_portal_contract/demo/account_analytic_account_demo.xml
@@ -13,8 +13,6 @@
         <field name="partner_id" ref="portal.demo_user0_res_partner" />
         <field name="recurring_invoices" eval="True" />
         <field name="website_template_id" ref="website_contract_template_default" />
-        <field name="recurring_invoice_line_ids"
-               eval="[(6, 0, [ref('account_analytic_invoice_line_1')])]" />
     </record>
 
 </odoo>
diff --git a/website_portal_contract/demo/account_analytic_invoice_line_demo.xml b/website_portal_contract/demo/account_analytic_invoice_line_demo.xml
index 134013d9..6e793239 100644
--- a/website_portal_contract/demo/account_analytic_invoice_line_demo.xml
+++ b/website_portal_contract/demo/account_analytic_invoice_line_demo.xml
@@ -10,6 +10,7 @@
         <field name="quantity">10</field>
         <field name="uom_id" ref="product.product_uom_unit" />
         <field name="price_unit">25</field>
+        <field name="analytic_account_id" ref="account_analytic_account_1" />
     </record>
 
 </odoo>
diff --git a/website_portal_contract/tests/__init__.py b/website_portal_contract/tests/__init__.py
index d0a91d6d..87b94354 100644
--- a/website_portal_contract/tests/__init__.py
+++ b/website_portal_contract/tests/__init__.py
@@ -5,4 +5,4 @@
 from . import test_account_analytic_account
 from . import test_account_analytic_contract_template
 from . import test_account_analytic_contract
-from . import test_controller
+from . import test_ui
diff --git a/website_portal_contract/tests/test_controller.py b/website_portal_contract/tests/test_ui.py
similarity index 55%
rename from website_portal_contract/tests/test_controller.py
rename to website_portal_contract/tests/test_ui.py
index 9883f5be..a607c353 100644
--- a/website_portal_contract/tests/test_controller.py
+++ b/website_portal_contract/tests/test_ui.py
@@ -3,7 +3,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.tests.common import HttpCase
-from odoo.addons.website.models.website import slug
 
 
 class TestController(HttpCase):
@@ -11,21 +10,6 @@ class TestController(HttpCase):
     post_install = True
     at_install = False
 
-    def test_template_view(self):
-        """ It should respond with 200 status """
-        contract = self.env.ref(
-            'website_portal_contract.'
-            'website_contract_template_default'
-        )
-        self.authenticate('admin', 'admin')
-        response = self.url_open(
-            '/contract/template/%s' % slug(contract)
-        )
-        self.assertEquals(
-            response.getcode(),
-            200,
-        )
-
     def test_portal_contract_view_tour(self):
         """ Tests contract view is correct """
         tour = "odoo.__DEBUG__.services['web_tour.tour']"