diff --git a/tests/protocol_compatibility/test_api_compatibility.py b/tests/protocol_compatibility/test_api_compatibility.py
index 818e7ae..88bdc46 100644
--- a/tests/protocol_compatibility/test_api_compatibility.py
+++ b/tests/protocol_compatibility/test_api_compatibility.py
@@ -1,7 +1,5 @@
-import json
 import pytest
 
-from src.client.nomos_cli import NomosCli
 from src.libs.common import to_app_id, to_index, delay
 from src.libs.custom_logger import get_custom_logger
 from src.steps.consensus import StepsConsensus
@@ -12,6 +10,37 @@ from src.test_data import DATA_TO_DISPERSE
 logger = get_custom_logger(__name__)
 
 
+# Extract commitments from indexed shares
+def extract_commitments(index_shares):
+    aggregated_column_commitments = []
+    rows_commitments = []
+
+    for index, shares in index_shares:
+        for share in shares:
+            a_c_c = share["aggregated_column_commitment"]
+            if a_c_c not in aggregated_column_commitments:
+                aggregated_column_commitments.append(a_c_c)
+
+            r_c = share["rows_commitments"]
+            for commitment in r_c:
+                if commitment not in rows_commitments:
+                    rows_commitments.append(commitment)
+
+    return aggregated_column_commitments, rows_commitments
+
+
+# Parse commitments received by get_shares_commitments
+def parse_commitments(commitments):
+    aggregated_column_commitments = []
+    rows_commitments = []
+    for commitment in commitments:
+        aggregated_column_commitments.append(commitment["aggregated_column_commitment"])
+        for rows_commitment in commitment["rows_commitments"]:
+            rows_commitments.append(rows_commitment)
+
+    return aggregated_column_commitments, rows_commitments
+
+
 class TestApiCompatibility(StepsDataAvailability, StepsConsensus, StepsStorage):
     main_nodes = []
 
@@ -19,25 +48,13 @@ class TestApiCompatibility(StepsDataAvailability, StepsConsensus, StepsStorage):
     def test_da_consensus_compatibility(self):
         self.disperse_data(DATA_TO_DISPERSE[2], to_app_id(1), to_index(0))
         delay(5)
-        shares = self.get_data_range(self.node2, to_app_id(1), to_index(0), to_index(5))
-        logger.debug(f"shares: {shares}")
-        aggregated_column_commitments = []
-        rows_commitments = []
-        for index_share in shares:
-            if len(index_share[1]) != 0:
-                for share in index_share[1]:
-                    a_c_c = share["aggregated_column_commitment"]
-                    if a_c_c not in aggregated_column_commitments:
-                        aggregated_column_commitments.append(a_c_c)
-
-                    r_c = share["rows_commitments"]
-                    for commitment in r_c:
-                        if commitment not in rows_commitments:
-                            rows_commitments.append(commitment)
+        index_shares = self.get_data_range(self.node2, to_app_id(1), to_index(0), to_index(5))
+        column_commitments, rows_commitments = extract_commitments(index_shares)
 
+        # Get headers of received blocks
         headers = self.get_cryptarchia_headers(self.node2)
 
-        # Get storage blocks for headerIDs
+        # Get storage blocks for headers
         blob_ids = []
         for header in headers:
             block = self.get_storage_block(self.node2, header)
@@ -52,16 +69,8 @@ class TestApiCompatibility(StepsDataAvailability, StepsConsensus, StepsStorage):
             commitment = self.get_shares_commitments(self.node2, blob_id)
             commitments.append(commitment)
 
-        rcv_aggregated_column_commitments = []
-        rcv_rows_commitments = []
-        for commitment in commitments:
-            rcv_aggregated_column_commitments.append(commitment["aggregated_column_commitment"])
-            for rcv_rows_commitment in commitment["rows_commitments"]:
-                rcv_rows_commitments.append(rcv_rows_commitment)
+        rcv_column_commitments, rcv_rows_commitments = parse_commitments(commitments)
 
         # Check commitments from shares match commitments received based on consensus data
-        for a_c_c in aggregated_column_commitments:
-            assert a_c_c in rcv_aggregated_column_commitments
-
-        for r_c in rows_commitments:
-            assert r_c in rcv_rows_commitments
+        assert all(c in rcv_column_commitments for c in column_commitments), "Not all aggregated column commitments are present"
+        assert all(r in rcv_rows_commitments for r in rows_commitments), "Not all rows commitments are present"