diff --git a/document_page_approval/data/email_template.xml b/document_page_approval/data/email_template.xml
index b5fc8ad8..e31c8bcb 100644
--- a/document_page_approval/data/email_template.xml
+++ b/document_page_approval/data/email_template.xml
@@ -5,8 +5,7 @@
 
     <data noupdate="1">
 
-        <record id="email_template_new_draft_need_approval"
-                model="mail.template">
+        <record id="email_template_new_draft_need_approval" model="mail.template">
             <field name="name">Automated new draft need approval Notification Mail</field>
             <field name="email_from">${object.create_uid.company_id.email or 'noreply@localhost.com'}</field>
             <field name="subject">New version of "${object.page_id.name}" to approve</field>
@@ -14,7 +13,8 @@
             <field name="model_id" ref="model_document_page_history"/>
             <field name="auto_delete" eval="True"/>
             <field name="lang">${object.create_uid.partner_id.lang}</field>
-            <field name="body_html"><![CDATA[
+            <field name="body_html">
+                <![CDATA[
 <p>Hello,</p>
 
 <p>The page "${object.page_id.name}" has been modified and need your approval.</p>
diff --git a/document_page_approval/security/document_page_security.xml b/document_page_approval/security/document_page_security.xml
index 0e5bfd66..d41d96f8 100644
--- a/document_page_approval/security/document_page_security.xml
+++ b/document_page_approval/security/document_page_security.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <data noupdate="0">
-    <record id="base.group_document_approver_user" model="res.groups">
+    <record id="group_document_approver_user" model="res.groups">
         <field name="name">Document approver</field>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
diff --git a/document_page_approval/security/ir.model.access.csv b/document_page_approval/security/ir.model.access.csv
index e4835836..f8e75f15 100644
--- a/document_page_approval/security/ir.model.access.csv
+++ b/document_page_approval/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-document_page_history,document.page.history,model_document_page_history,base.group_document_approver_user,1,1,1,0
\ No newline at end of file
+document_page_history,document.page.history,model_document_page_history,group_document_approver_user,1,1,1,0
diff --git a/document_page_approval/tests/test_document_page_approval.py b/document_page_approval/tests/test_document_page_approval.py
index 0ac7232d..4c0e8457 100644
--- a/document_page_approval/tests/test_document_page_approval.py
+++ b/document_page_approval/tests/test_document_page_approval.py
@@ -10,19 +10,20 @@ class TestDocumentPageApproval(common.TransactionCase):
         # Check content of a category
         category = self.env['document.page'].search([
             ('name', '=', 'OpenERP Features')
-            ])
+        ])
 
         self.assertIsNotNone(category.display_content, 'a category')
 
         # Check content of a page
         pages = self.env['document.page'].search([
             ('parent_id', '=', category.id)
-            ])
+        ])
         page = pages[0]
         self.assertIsNotNone(page.display_content, 'Page content')
 
         # Check if approval is required
-        self.assertFalse(page.is_approval_required(page))
+        self.assertTrue(page.is_approval_required(page) ==
+                        category.approval_required)
 
         # Check content of an approval page
         page.approval_required = True
diff --git a/document_page_approval/tests/test_document_page_history_workflow.py b/document_page_approval/tests/test_document_page_history_workflow.py
index bca965d3..508aff80 100644
--- a/document_page_approval/tests/test_document_page_history_workflow.py
+++ b/document_page_approval/tests/test_document_page_history_workflow.py
@@ -12,17 +12,26 @@ class TestDocumentPageHistoryWorkflow(common.TransactionCase):
 
     def test_can_user_approve_this_page(self):
         """Test if a user can approve this page."""
-        user = self.env.user
         category = self.env.ref('document_page.demo_category1')
         category.approval_required = True
-        category.approver_uid = user
+        category.approver_gid = self.env.ref(
+            'document_page_approval.group_document_approver_user')
 
-        pages = self.env['document.page.history'].search([
-            ('page_id', '=', category.id)
-            ])
-        page = pages[0]
+        page = self.env['document.page'].create({
+            'name': 'Test Page10',
+            'content': 'A difficult test',
+            'parent_id': category.id
+        })
 
-        self.assertTrue(page.can_user_approve)
+        history = self.env['document.page.history'].search(
+            [
+                ('page_id', '=', page.id)
+            ],
+            limit=1,
+            order='create_date DESC'
+        )
+
+        self.assertTrue(history.can_user_approve_page)
 
     def test_get_approvers_guids(self):
         """Get approver guids."""
@@ -30,7 +39,7 @@ class TestDocumentPageHistoryWorkflow(common.TransactionCase):
         category.approval_required = True
         pages = self.env['document.page.history'].search([
             ('page_id', '=', category.id)
-            ])
+        ])
         page = pages[0]
         approvers_guid = page.get_approvers_guids()
         self.assertTrue(len(approvers_guid) > 0)
@@ -41,7 +50,7 @@ class TestDocumentPageHistoryWorkflow(common.TransactionCase):
         category.approval_required = True
         pages = self.env['document.page.history'].search([
             ('page_id', '=', category.id)
-            ])
+        ])
         page = pages[0]
         _logger.info("Email: " + str(page.get_approvers_email))
         self.assertIsNotNone(page.get_approvers_email)
@@ -52,7 +61,7 @@ class TestDocumentPageHistoryWorkflow(common.TransactionCase):
         category.approval_required = True
         pages = self.env['document.page.history'].search([
             ('page_id', '=', category.id)
-            ])
+        ])
         page = pages[0]
-        _logger.info("Page: "+str(page.get_page_url))
+        _logger.info("Page: " + str(page.get_page_url))
         self.assertIsNotNone(page.get_page_url)