diff --git a/beacon_chain/spec/eip7594_helpers.nim b/beacon_chain/spec/eip7594_helpers.nim
index 524ea6d3c..e724cb805 100644
--- a/beacon_chain/spec/eip7594_helpers.nim
+++ b/beacon_chain/spec/eip7594_helpers.nim
@@ -87,9 +87,10 @@ proc recover_matrix*(cells_dict: Table[(BlobIndex, CellID), Cell], blobCount: ui
   var extended_matrix: ExtendedMatrix
 
   for blobIndex in 0'u64..<blobCount:
-    var cellIds: seq[CellID] = @[]
-    var blIdx: BlobIndex
-    var cellId: CellID
+    var 
+      cellIds: seq[CellID] = @[]
+      blIdx: BlobIndex
+      cellId: CellID
     let key = (blIdx, cellId)
 
     for key, cell in pairs(cells_dict):
@@ -126,7 +127,7 @@ proc get_data_column_sidecars*(signed_block: deneb.SignedBeaconBlock, blobs: seq
       computed_cell = computeCellsAndKzgProofs(blob)
 
     if computed_cell.isErr():
-      fatal "EIP7549: Could not compute cells"
+      return err("EIP7549: Could not compute cells")
 
     cellsAndProofs.add(computed_cell.get())
 
diff --git a/tests/consensus_spec/test_fixture_kzg.nim b/tests/consensus_spec/test_fixture_kzg.nim
index 71907372a..029007673 100644
--- a/tests/consensus_spec/test_fixture_kzg.nim
+++ b/tests/consensus_spec/test_fixture_kzg.nim
@@ -212,7 +212,7 @@ proc runComputeCellsTest(suiteName, suitePath, path: string) =
       if p.isErr:
         check output.kind == JNull
       else:
-        for i in 0..<128:
+        for i in 0..<len(p.get):
           check p.get[i] == fromHex[2048](output[i].getStr).get
 
 proc runComputeCellsAndProofsTest(suiteName, suitePath, path: string) =
@@ -234,7 +234,7 @@ proc runComputeCellsAndProofsTest(suiteName, suitePath, path: string) =
       if p.isErr:
         check output.kind == JNull
       else:
-        for i in 0..<128:
+        for i in 0..<CELLS_PER_EXT_BLOB:
           check p.get.cells[i] == fromHex[2048](output[0][i].getStr).get
           check p.get.proofs[i] == fromHex[48](output[1][i].getStr).get
 
@@ -316,7 +316,7 @@ proc runRecoverAllCellsTest(suiteName, suitePath, path: string) =
       if v.isErr:
         check output.kind == JNull
       else:
-        for i in 0..<128:
+        for i in 0..<CELLS_PER_EXT_BLOB:
           check v.get[i] == fromHex[2048](output[i].getStr).get
 
 from std/algorithm import sorted
diff --git a/tests/consensus_spec/test_fixture_networking.nim b/tests/consensus_spec/test_fixture_networking.nim
index bd82e728d..b82020118 100644
--- a/tests/consensus_spec/test_fixture_networking.nim
+++ b/tests/consensus_spec/test_fixture_networking.nim
@@ -76,8 +76,4 @@ suite "EF - EIP7594 - Networking" & preset():
   let basePath =
     presetPath/"eip7594"/"networking"/"get_custody_columns"/"pyspec_tests"
   for kind, path in walkDir(basePath, relative = true, checkDir = true):
-    runGetCustodyColumns(suiteName, basePath/path)
-
-
-    
-        
\ No newline at end of file
+    runGetCustodyColumns(suiteName, basePath/path)
\ No newline at end of file