diff --git a/event_contact/README.rst b/event_contact/README.rst
index 3ceb3c0da..e477b4094 100644
--- a/event_contact/README.rst
+++ b/event_contact/README.rst
@@ -85,6 +85,9 @@ Contributors
   - Ernesto Tejeda
 
 - Eduardo López <elp@moduon.team>
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+  - Bhavesh Heliconia
 
 Maintainers
 -----------
diff --git a/event_contact/__manifest__.py b/event_contact/__manifest__.py
index f3eb9fb52..1b00e0abd 100644
--- a/event_contact/__manifest__.py
+++ b/event_contact/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Event Contacts",
-    "version": "16.0.1.0.0",
+    "version": "18.0.1.0.0",
     "summary": "Add contacts to event and event type",
     "author": "OpenSynergy Indonesia, "
     "Tecnativa, "
diff --git a/event_contact/readme/CONTRIBUTORS.md b/event_contact/readme/CONTRIBUTORS.md
index 6217d4633..13ff3a393 100644
--- a/event_contact/readme/CONTRIBUTORS.md
+++ b/event_contact/readme/CONTRIBUTORS.md
@@ -5,3 +5,5 @@
   - Alexandre Díaz
   - Ernesto Tejeda
 - Eduardo López \<<elp@moduon.team>\>
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+  - Bhavesh Heliconia
diff --git a/event_contact/static/description/index.html b/event_contact/static/description/index.html
index 0611af753..30c10e91f 100644
--- a/event_contact/static/description/index.html
+++ b/event_contact/static/description/index.html
@@ -432,6 +432,10 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </li>
 <li>Eduardo López &lt;<a class="reference external" href="mailto:elp&#64;moduon.team">elp&#64;moduon.team</a>&gt;</li>
+<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
+<li>Bhavesh Heliconia</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/event_contact/tests/test_event.py b/event_contact/tests/test_event.py
index 2adbe8aab..1b2762fad 100644
--- a/event_contact/tests/test_event.py
+++ b/event_contact/tests/test_event.py
@@ -2,34 +2,36 @@
 # Copyright 2019 Alexandre Díaz <alexandre.diaz@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp.tests.common import TransactionCase
+from odoo import Command
+from odoo.tests.common import TransactionCase
 
 
 class EventCase(TransactionCase):
-    def setUp(self, *args, **kwargs):
-        super().setUp(*args, **kwargs)
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
 
         # Partners
-        self.partner1 = self.env["res.partner"].create({"name": "Test Partner 1"})
-        self.partner2 = self.env["res.partner"].create({"name": "Test Partner 2"})
-        self.partner3 = self.env["res.partner"].create({"name": "Test Partner 3"})
-        self.partner4 = self.env["res.partner"].create({"name": "Test Partner 4"})
-        self.partner5 = self.env["res.partner"].create({"name": "Test Partner 5"})
+        cls.partner1 = cls.env["res.partner"].create({"name": "Test Partner 1"})
+        cls.partner2 = cls.env["res.partner"].create({"name": "Test Partner 2"})
+        cls.partner3 = cls.env["res.partner"].create({"name": "Test Partner 3"})
+        cls.partner4 = cls.env["res.partner"].create({"name": "Test Partner 4"})
+        cls.partner5 = cls.env["res.partner"].create({"name": "Test Partner 5"})
 
-        self.type1 = self.env["event.type"].create(
+        cls.type1 = cls.env["event.type"].create(
             {
                 "name": "Event Type Test 1",
-                "contact_ids": [(6, False, [self.partner1.id, self.partner2.id])],
+                "contact_ids": [Command.set([cls.partner1.id, cls.partner2.id])],
             }
         )
-        self.type2 = self.env["event.type"].create(
+        cls.type2 = cls.env["event.type"].create(
             {
                 "name": "Event Type Test 2",
-                "contact_ids": [(6, False, [self.partner3.id, self.partner4.id])],
+                "contact_ids": [Command.set([cls.partner3.id, cls.partner4.id])],
             }
         )
 
-        self.event1 = self.env["event.event"].create(
+        cls.event1 = cls.env["event.event"].create(
             {
                 "name": "Event Test 1",
                 "date_begin": "2019-06-20",
@@ -44,7 +46,7 @@ def test_event_onchange_type_contacts_empty(self):
 
     def test_event_onchange_type_contacts_full(self):
         """Contacts not updated because it is not empty."""
-        self.event1.contact_ids = [(6, False, [self.partner5.id])]
+        self.event1.contact_ids = [Command.set([self.partner5.id])]
         self.event1.event_type_id = self.type1
         self.assertEqual(
             self.event1.contact_ids, self.partner5 | self.type1.contact_ids