diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 85476c8f7fe..50f2d8e381e 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
-        <template id="website.test0" name="Test0">
-            <p>Super cacaprout</p>
-        </template>
-
-        <record id="action_website_test" model="ir.actions.server">
-            <field name="name">Website Test</field>
-            <field name="condition">True</field>
-            <field name="website_published" eval="True"/>
-            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="code">
-values = {}
-template = request.website.render("website.test0", values)
-            </field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-        </record>
-    </data>
-
     <data noupdate="1">
         <record id="default_website" model="website">
             <field name="name">www.openerp.com</field>
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index d23bc50c817..66919daf960 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -1,5 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+
+        <template id="template_partner_demo" name="Partner Template (Server Action Demo)">
+<t t-call="website.layout">
+    <t t-set="additional_title">Members</t>
+    <div id="wrap">
+        <div class="oe_structure">
+            <section data-snippet-id="title">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h1 class="text-center">Our Members Directory</h1>
+                            <h3 class="text-muted text-center">Find a business partner</h3>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        <div class="container">
+            <t t-foreach="partners" t-as="partner">
+                <div class="row">
+                    <span t-field="partner.name"/>
+                </div>
+            </t>
+        </div>
+    </div>
+</t>
+        </template>
+
+        <record id="action_partner_demo" model="ir.actions.server">
+            <field name="name">Website Test</field>
+            <field name="condition">True</field>
+            <field name="website_published" eval="True"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="code">
+partner_ids = pool['res.partner'].search(cr, uid, [('customer', '=', True)], context=context)
+partners = pool['res.partner'].browse(cr, uid, partner_ids, context=context)
+values = {
+    'partners': partners,
+}
+template = request.website.render("website.template_partner_demo", values)
+            </field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
+    </data>
+
     <data>
 
         <record id="default_website" model="website">