diff --git a/bemade_fsm/tests/test_fsm_contact_setting.py b/bemade_fsm/tests/test_fsm_contact_setting.py
index 7d32ecb..81ceb1a 100644
--- a/bemade_fsm/tests/test_fsm_contact_setting.py
+++ b/bemade_fsm/tests/test_fsm_contact_setting.py
@@ -54,3 +54,39 @@ class SaleOrderFSMContactsCase(FSMManagerUserTransactionCase):
         self.assertTrue(self.contact_2 not in so.work_order_contacts)
         self.assertTrue(
             so.work_order_contacts != so.partner_id.work_order_contacts and len(so.partner_id.work_order_contacts) == 2)
+
+
+class SaleOrderMultiLocationContactsTest(SaleOrderFSMContactsCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.shipping_location = cls.env['res.partner'].create({
+            'name': 'Shipping location',
+            'company_type': 'company',
+            'type': 'delivery',
+            'parent_id': cls.parent_co.id,
+        })
+        cls.site_contact1 = cls.env['res.partner'].create({
+            'name': 'Site Contact One',
+            'company_type': 'person',
+            'type': 'contact',
+            'parent_id': cls.shipping_location.id,
+        })
+        cls.site_contact2 = cls.env['res.partner'].create({
+            'name': 'Site Contact Two',
+            'company_type': 'person',
+            'type': 'contact',
+            'parent_id': cls.shipping_location.id,
+        })
+        cls.shipping_location.write({
+            'work_order_contacts': [Command.set([cls.contact_1.id, cls.contact_2.id])],
+            'site_contacts': [Command.set([cls.site_contact1.id, cls.site_contact2.id])],
+        })
+
+    def test_multilayer_site_contacts(self):
+        so = self.env['sale.order'].create({
+            'partner_id': self.parent_co.id,
+            'partner_shipping_id': self.shipping_location.id})
+        self.assertEqual(so.partner_shipping_id, self.shipping_location)
+        self.assertEqual(so.site_contacts, self.shipping_location.site_contacts)
+        self.assertEqual(so.work_order_contacts, self.shipping_location.work_order_contacts)
diff --git a/bemade_fsm/tests/test_sale_order.py b/bemade_fsm/tests/test_sale_order.py
index cb28715..3565ef0 100644
--- a/bemade_fsm/tests/test_sale_order.py
+++ b/bemade_fsm/tests/test_sale_order.py
@@ -110,8 +110,7 @@ class TestSalesOrder(TestTaskTemplateCommon):
         # Marking a child task done should not create a sale order
         child_task.action_fsm_validate()
         self.assertFalse(child_task.sale_order_id)
-# TODO: Add a test for updating equipment, site contacts and work order contacts on the
-#       sale order when modifying the partner_shipping_id field on the SO.
+
 
 @tagged("-at_install", "post_install", 'focus')
 class TestSaleOrderTour(HttpCase, TestSalesOrder):