diff --git a/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs b/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs
index cbb1fcf711..9b938046e2 100644
--- a/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs
+++ b/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs
@@ -760,6 +760,7 @@ mod data_availability_checker_tests {
                 execution_requests: ExecutionRequests::default(),
                 builder_index: 0,
                 beacon_block_root: block_root,
+                parent_beacon_block_root: Hash256::random(),
             },
             signature: bls::Signature::infinity().expect("should create infinity sig"),
         })
diff --git a/beacon_node/beacon_chain/tests/block_verification.rs b/beacon_node/beacon_chain/tests/block_verification.rs
index b2db85713f..af858874b2 100644
--- a/beacon_node/beacon_chain/tests/block_verification.rs
+++ b/beacon_node/beacon_chain/tests/block_verification.rs
@@ -1745,7 +1745,7 @@ async fn add_base_block_to_altair_chain() {
                     RangeSyncBlock::new(
                         Arc::new(base_block),
                         AvailableBlockData::NoData,
-                        &harness.chain.pending_block_cache,
+                        &harness.chain.data_availability_checker,
                         harness.spec.clone()
                     )
                     .unwrap()
@@ -1890,7 +1890,7 @@ async fn add_altair_block_to_base_chain() {
                     RangeSyncBlock::new(
                         Arc::new(altair_block),
                         AvailableBlockData::NoData,
-                        &harness.chain.pending_block_cache,
+                        &harness.chain.data_availability_checker,
                         harness.spec.clone()
                     )
                     .unwrap()
diff --git a/beacon_node/beacon_chain/tests/column_verification.rs b/beacon_node/beacon_chain/tests/column_verification.rs
index 06a5f44e5f..e779135e3f 100644
--- a/beacon_node/beacon_chain/tests/column_verification.rs
+++ b/beacon_node/beacon_chain/tests/column_verification.rs
@@ -6,7 +6,8 @@ use beacon_chain::test_utils::{
     generate_data_column_sidecars_from_block, test_spec,
 };
 use beacon_chain::{
-    AvailabilityProcessingStatus, BlockError, ChainConfig, InvalidSignature, NotifyExecutionLayer,
+    AvailabilityProcessingStatus, BlockError, BlockOrEnvelopeError, ChainConfig, InvalidSignature,
+    NotifyExecutionLayer,
     block_verification_types::{AsBlock, LookupBlock},
 };
 use bls::{Keypair, Signature};
@@ -111,7 +112,9 @@ async fn rpc_columns_with_invalid_header_signature() {
         .unwrap_err();
     assert!(matches!(
         err,
-        BlockError::InvalidSignature(InvalidSignature::ProposerSignature)
+        BlockOrEnvelopeError::BlockError(BlockError::InvalidSignature(
+            InvalidSignature::ProposerSignature
+        ))
     ));
 }
 
diff --git a/beacon_node/network/src/network_beacon_processor/tests.rs b/beacon_node/network/src/network_beacon_processor/tests.rs
index 75d08eb965..c4e7f8f8d1 100644
--- a/beacon_node/network/src/network_beacon_processor/tests.rs
+++ b/beacon_node/network/src/network_beacon_processor/tests.rs
@@ -1196,7 +1196,7 @@ async fn accept_processed_gossip_data_columns_without_import() {
 
     let block_root = rig.next_block.canonical_root();
     rig.chain
-        .pending_block_cache
+        .data_availability_checker
         .put_gossip_verified_data_columns(block_root, rig.next_block.slot(), verified_data_columns)
         .expect("should put data columns into availability cache");