diff --git a/agreement_repair/__init__.py b/agreement_repair/__init__.py
index 631bd4893..1ae95437a 100644
--- a/agreement_repair/__init__.py
+++ b/agreement_repair/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/agreement_repair/__manifest__.py b/agreement_repair/__manifest__.py
index 5fbe1d8b8..5821804b7 100644
--- a/agreement_repair/__manifest__.py
+++ b/agreement_repair/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
diff --git a/agreement_repair/models/__init__.py b/agreement_repair/models/__init__.py
index 57f411594..4676ccb84 100644
--- a/agreement_repair/models/__init__.py
+++ b/agreement_repair/models/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
diff --git a/agreement_repair/models/agreement.py b/agreement_repair/models/agreement.py
index b5118fde0..72284f79b 100644
--- a/agreement_repair/models/agreement.py
+++ b/agreement_repair/models/agreement.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class Agreement(models.Model):
@@ -9,7 +9,6 @@ class Agreement(models.Model):
 
     repair_count = fields.Integer("# Repair Orders", compute="_compute_repair_count")
 
-    @api.multi
     def _compute_repair_count(self):
         for ag_rec in self:
             ag_rec.repair_count = self.env["repair.order"].search_count(
diff --git a/agreement_repair/models/repair.py b/agreement_repair/models/repair.py
index ffc1d3bc9..4e2b92ffa 100644
--- a/agreement_repair/models/repair.py
+++ b/agreement_repair/models/repair.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2021 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
diff --git a/agreement_repair/tests/__init__.py b/agreement_repair/tests/__init__.py
new file mode 100644
index 000000000..0e75ecb26
--- /dev/null
+++ b/agreement_repair/tests/__init__.py
@@ -0,0 +1,3 @@
+# License LGPLv3.0 or later (https://www.gnu.org/licenses/lgpl-3.0.en.html).
+
+from . import test_agreement_repair
diff --git a/agreement_repair/tests/test_agreement_repair.py b/agreement_repair/tests/test_agreement_repair.py
new file mode 100644
index 000000000..74866b9e1
--- /dev/null
+++ b/agreement_repair/tests/test_agreement_repair.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2021 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import odoo.tests.common as common
+from odoo import fields
+
+
+class TestAgreementRepair(common.TransactionCase):
+    def setUp(self):
+        super(TestAgreementRepair, self).setUp()
+
+        self.agreement_obj = self.env["agreement"]
+        self.agreement_type_id = self.env["agreement.type"].create(
+            {"name": "Test Agreement Type", "active": True}
+        )
+        self.product = self.env.ref(
+            "product.product_product_8_product_template"
+        )
+
+    def test_fieldservice_purchase(self):
+        agreement_vals = {
+            "name": "Test Agreement",
+            "agreement_type_id": self.agreement_type_id.id,
+            "description": "Test Agreement",
+            "start_date": fields.Date.today(),
+            "end_date": fields.Date.today(),
+        }
+        agreement = self.agreement_obj.create(agreement_vals)
+
+        repair_rec = self.env.ref('repair.repair_r0')
+        repair_rec.write({'agreement_id': agreement.id})
+
+        agreement._compute_repair_count()
+        self.assertEqual(agreement.repair_count, 1, "Wrong no of Repair Orders Count!")
diff --git a/agreement_repair/views/agreement_view.xml b/agreement_repair/views/agreement_view.xml
index ee48a615d..5c5f270bc 100644
--- a/agreement_repair/views/agreement_view.xml
+++ b/agreement_repair/views/agreement_view.xml
@@ -5,7 +5,6 @@
         <field name="name">Repair Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">repair.order</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('agreement_id', '=', active_id)]</field>
         <field name="context">{'create': False, 'edit': False}</field>