diff --git a/pms/tests/test_pms_folio.py b/pms/tests/test_pms_folio.py
index 7fdeef8c0..920a2c001 100644
--- a/pms/tests/test_pms_folio.py
+++ b/pms/tests/test_pms_folio.py
@@ -10,7 +10,8 @@ freeze_time("2000-02-02")
 
 
 class TestPmsFolio(common.SavepointCase):
-    def create_common_scenario(self):
+    def setUp(self):
+        super().setUp()
         # create a room type availability
         self.room_type_availability = self.env["pms.availability.plan"].create(
             {"name": "Availability plan for TEST"}
@@ -88,7 +89,6 @@ class TestPmsFolio(common.SavepointCase):
         )
 
     def create_multiproperty_scenario(self):
-        self.create_common_scenario()
         self.property1 = self.env["pms.property"].create(
             {
                 "name": "Property_1",
@@ -124,7 +124,6 @@ class TestPmsFolio(common.SavepointCase):
 
     def test_commission_and_partner_correct(self):
         # ARRANGE
-        self.create_common_scenario()
         PmsFolio = self.env["pms.folio"]
         PmsReservation = self.env["pms.reservation"]
         PmsPartner = self.env["res.partner"]
@@ -175,7 +174,6 @@ class TestPmsFolio(common.SavepointCase):
             )
 
     def test_compute_folio_priority(self):
-        self.create_common_scenario()
         r1 = self.env["pms.reservation"].create(
             {
                 "checkin": fields.date.today(),
@@ -209,7 +207,6 @@ class TestPmsFolio(common.SavepointCase):
         # Folio is paid after execute
         #
         # ARRANGE
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -241,7 +238,6 @@ class TestPmsFolio(common.SavepointCase):
         #
         # ARRANGE
         left_to_pay = 1
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -288,7 +284,6 @@ class TestPmsFolio(common.SavepointCase):
             )
 
     def _test_compute_currency(self):
-        self.create_common_scenario()
         self.currency1 = self.env["res.currency"].create(
             {
                 "name": "currency1",
diff --git a/pms/tests/test_pms_folio_invoice.py b/pms/tests/test_pms_folio_invoice.py
index f2da8e3b6..67754d22b 100644
--- a/pms/tests/test_pms_folio_invoice.py
+++ b/pms/tests/test_pms_folio_invoice.py
@@ -6,10 +6,7 @@ from odoo.tests import common
 class TestPmsFolioInvoice(common.SavepointCase):
     def setUp(self):
         super(TestPmsFolioInvoice, self).setUp()
-
-    def create_common_scenario(self):
-        # create a room type availability
-        # sequences
+        # create a room type availability and sequences
         self.folio_sequence = self.env["ir.sequence"].create(
             {
                 "name": "PMS Folio",
@@ -95,7 +92,6 @@ class TestPmsFolioInvoice(common.SavepointCase):
 
     def test_invoice_full_folio(self):
         # ARRANGE
-        self.create_common_scenario()
         r1 = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -121,7 +117,6 @@ class TestPmsFolioInvoice(common.SavepointCase):
 
     def test_invoice_partial_folio_by_steps(self):
         # ARRANGE
-        self.create_common_scenario()
         r1 = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -162,7 +157,6 @@ class TestPmsFolioInvoice(common.SavepointCase):
 
     def test_invoice_partial_folio_diferent_partners(self):
         # ARRANGE
-        self.create_common_scenario()
         r1 = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -208,7 +202,6 @@ class TestPmsFolioInvoice(common.SavepointCase):
 
     def test_invoice_partial_folio_wrong_qtys(self):
         # ARRANGE
-        self.create_common_scenario()
         r1 = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
diff --git a/pms/tests/test_pms_folio_sale_line.py b/pms/tests/test_pms_folio_sale_line.py
index 8e80126e0..a3ce98f0f 100644
--- a/pms/tests/test_pms_folio_sale_line.py
+++ b/pms/tests/test_pms_folio_sale_line.py
@@ -4,7 +4,8 @@ from .common import TestPms
 
 
 class TestPmsFolioSaleLine(TestPms):
-    def create_common_scenario(self):
+    def setUp(self):
+        super().setUp()
         # create a room type availability
         self.room_type_availability = self.env["pms.availability.plan"].create(
             {"name": "Availability plan for TEST"}
@@ -53,7 +54,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_sale_lines = 1
-        self.create_common_scenario()
 
         # ACT
         r_test = self.env["pms.reservation"].create(
@@ -81,7 +81,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_sale_lines = 2
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -112,7 +111,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_sale_lines = 2
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -143,7 +141,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_sale_lines = 2
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -175,7 +172,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_sale_lines = 1
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -207,7 +203,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -242,7 +237,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -278,7 +272,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         r_test = self.env["pms.reservation"].create(
             {
                 "pms_property_id": self.property.id,
@@ -315,7 +308,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_board_service_sale_lines = 1
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -375,7 +367,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_board_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -435,7 +426,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_board_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -498,7 +488,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_board_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -561,7 +550,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_board_service_sale_lines = 1
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -623,7 +611,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same board service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -684,7 +671,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same board service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -751,7 +737,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same board service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -821,7 +806,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_extra_service_sale_lines = 1
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -871,7 +855,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_extra_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -923,7 +906,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_extra_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -976,7 +958,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_extra_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1030,7 +1011,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_extra_service_sale_lines = 1
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1082,7 +1062,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1134,7 +1113,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1187,7 +1165,6 @@ class TestPmsFolioSaleLine(TestPms):
         # Should keep the same reservation service sales line record.
 
         # ARRANGE
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1242,7 +1219,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_folio_service_sale_lines = 1
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",
@@ -1289,7 +1265,6 @@ class TestPmsFolioSaleLine(TestPms):
 
         # ARRANGE
         expected_folio_service_sale_lines = 2
-        self.create_common_scenario()
         product_test1 = self.env["product.product"].create(
             {
                 "name": "Test Product 1",