diff --git a/beacon_node/beacon_chain/tests/attestation_production.rs b/beacon_node/beacon_chain/tests/attestation_production.rs
index 907e7a40b..e4d8d8525 100644
--- a/beacon_node/beacon_chain/tests/attestation_production.rs
+++ b/beacon_node/beacon_chain/tests/attestation_production.rs
@@ -134,7 +134,7 @@ async fn produces_attestations() {
             assert_eq!(data.target.root, target_root, "bad target root");
 
             let rpc_block =
-                RpcBlock::<MainnetEthSpec>::new(Arc::new(block.clone()), blobs.clone()).unwrap();
+                RpcBlock::<MainnetEthSpec>::new(Arc::new(block.clone()), Some(blobs.clone())).unwrap();
             let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = chain
                 .data_availability_checker
                 .check_rpc_block_availability(rpc_block)
@@ -209,7 +209,7 @@ async fn early_attester_cache_old_request() {
         .get_blobs(&head.beacon_block_root)
         .expect("should get blobs");
 
-    let rpc_block = RpcBlock::<MainnetEthSpec>::new(head.beacon_block.clone(), head_blobs).unwrap();
+    let rpc_block = RpcBlock::<MainnetEthSpec>::new(head.beacon_block.clone(), Some(head_blobs)).unwrap();
     let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = harness.chain
         .data_availability_checker
         .check_rpc_block_availability(rpc_block)
diff --git a/beacon_node/beacon_chain/tests/block_verification.rs b/beacon_node/beacon_chain/tests/block_verification.rs
index 102707a38..cb16f8fa0 100644
--- a/beacon_node/beacon_chain/tests/block_verification.rs
+++ b/beacon_node/beacon_chain/tests/block_verification.rs
@@ -67,10 +67,10 @@ async fn get_chain_segment() -> (Vec<BeaconSnapshot<E>>, Vec<Option<BlobSidecarL
             beacon_state: snapshot.beacon_state,
         });
         segment_blobs.push(
-            harness
+            Some(harness
                 .chain
                 .get_blobs(&snapshot.beacon_block_root)
-                .unwrap(),
+                .unwrap()),
         )
     }
     (segment, segment_blobs)
@@ -114,26 +114,22 @@ async fn get_chain_segment_with_signed_blobs() -> (
             .chain
             .get_blobs(&snapshot.beacon_block_root)
             .unwrap()
-            .map(|blobs| {
-                let blobs = blobs
-                    .into_iter()
-                    .map(|blob| {
-                        let block_root = blob.block_root;
-                        let blob_index = blob.index;
-                        SignedBlobSidecar {
-                            message: blob,
-                            signature: harness
-                                .blob_signature_cache
-                                .read()
-                                .get(&BlobSignatureKey::new(block_root, blob_index))
-                                .unwrap()
-                                .clone(),
-                        }
-                    })
-                    .collect::<Vec<_>>();
-                VariableList::from(blobs)
-            });
-        segment_blobs.push(signed_blobs)
+            .into_iter()
+            .map(|blob| {
+                let block_root = blob.block_root;
+                let blob_index = blob.index;
+                SignedBlobSidecar {
+                    message: blob,
+                    signature: harness
+                        .blob_signature_cache
+                        .read()
+                        .get(&BlobSignatureKey::new(block_root, blob_index))
+                        .unwrap()
+                        .clone(),
+                }
+            })
+            .collect::<Vec<_>>();
+        segment_blobs.push(Some(VariableList::from(signed_blobs)))
     }
     (segment, segment_blobs)
 }
diff --git a/beacon_node/beacon_chain/tests/store_tests.rs b/beacon_node/beacon_chain/tests/store_tests.rs
index 18f1cbd7c..f575d64d4 100644
--- a/beacon_node/beacon_chain/tests/store_tests.rs
+++ b/beacon_node/beacon_chain/tests/store_tests.rs
@@ -2179,7 +2179,7 @@ async fn weak_subjectivity_sync() {
         beacon_chain
             .process_block(
                 full_block.canonical_root(),
-                RpcBlock::new(Arc::new(full_block), blobs).unwrap(),
+                RpcBlock::new(Arc::new(full_block), Some(blobs)).unwrap(),
                 NotifyExecutionLayer::Yes,
                 || Ok(()),
             )
@@ -2239,7 +2239,7 @@ async fn weak_subjectivity_sync() {
         if let MaybeAvailableBlock::Available(block) = harness
             .chain
             .data_availability_checker
-            .check_rpc_block_availability(RpcBlock::new(Arc::new(full_block), blobs).unwrap())
+            .check_rpc_block_availability(RpcBlock::new(Arc::new(full_block), Some(blobs)).unwrap())
             .expect("should check availability")
         {
             available_blocks.push(block);