diff --git a/vcp_management/tests/test_vcp_data.py b/vcp_management/tests/test_vcp_data.py
index 0832513..c42550b 100644
--- a/vcp_management/tests/test_vcp_data.py
+++ b/vcp_management/tests/test_vcp_data.py
@@ -44,9 +44,15 @@ def setUpClass(cls):
                 "from_date": date,
             }
         )
+        cls.partner_org_01 = cls.env["res.partner"].create(
+            {
+                "name": "Dixmit",
+            }
+        )
         cls.partner_01 = cls.env["res.partner"].create(
             {
                 "name": "Enric Tobella",
+                "parent_id": cls.partner_org_01.id,
             }
         )
         user_01 = cls.env["vcp.user"].create(
@@ -70,9 +76,17 @@ def setUpClass(cls):
                 "partner_id": cls.partner_02.id,
             }
         )
+
+        cls.partner_org_02 = cls.env["res.partner"].create(
+            {
+                "name": "ForgeFlow",
+            }
+        )
+
         cls.partner_03 = cls.env["res.partner"].create(
             {
                 "name": "Jordi Ballester",
+                "parent_id": cls.partner_org_02.id,
             }
         )
         user_03 = cls.env["vcp.user"].create(
@@ -84,11 +98,6 @@ def setUpClass(cls):
             }
         )
 
-        cls.partner_org_01 = cls.env["res.partner"].create(
-            {
-                "name": "Dixmit",
-            }
-        )
         org_01 = cls.env["vcp.organization"].create(
             {
                 "name": "Dixmit",
@@ -97,11 +106,6 @@ def setUpClass(cls):
                 "partner_id": cls.partner_org_01.id,
             }
         )
-        cls.partner_org_02 = cls.env["res.partner"].create(
-            {
-                "name": "ForgeFlow",
-            }
-        )
         org_02 = cls.env["vcp.organization"].create(
             {
                 "name": "ForgeFlow",
@@ -163,6 +167,15 @@ def setUpClass(cls):
                 "created_at": date,
             }
         )
+        cls.env["vcp.comment"].create(
+            {
+                "external_id": 2,
+                "body": "Test Comment From Jordi",
+                "request_id": pull_request_01.id,
+                "user_id": user_03.id,
+                "created_at": date,
+            }
+        )
 
     def test_partner_request_count(self):
         self.assertEqual(self.partner_01.vcp_comments, 1)
@@ -173,15 +186,17 @@ def test_partner_request_count(self):
         self.assertEqual(self.partner_02.vcp_created_requests, 1)
         self.assertEqual(self.partner_02.vcp_merged_requests, 0)
         self.assertEqual(self.partner_02.vcp_reviews, 0)
-        self.assertEqual(self.partner_03.vcp_comments, 0)
+        self.assertEqual(self.partner_03.vcp_comments, 1)
         self.assertEqual(self.partner_03.vcp_created_requests, 1)
         self.assertEqual(self.partner_03.vcp_merged_requests, 0)
         self.assertEqual(self.partner_03.vcp_reviews, 0)
+
         self.assertEqual(self.partner_org_01.vcp_comments, 1)
         self.assertEqual(self.partner_org_01.vcp_created_requests, 2)
         self.assertEqual(self.partner_org_01.vcp_merged_requests, 1)
         self.assertEqual(self.partner_org_01.vcp_reviews, 1)
-        self.assertEqual(self.partner_org_02.vcp_comments, 0)
+
+        self.assertEqual(self.partner_org_02.vcp_comments, 1)
         self.assertEqual(self.partner_org_02.vcp_created_requests, 1)
         self.assertEqual(self.partner_org_02.vcp_merged_requests, 0)
         self.assertEqual(self.partner_org_02.vcp_reviews, 0)