diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs
index c6ff558138..5ed7674f03 100644
--- a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs
+++ b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs
@@ -624,14 +624,12 @@ singleNodeTestConfigWith codecConfig storageConfig k genesisWindow = TopLevelCon
 
     ledgerCfgParams :: TestBlockLedgerConfig
     ledgerCfgParams = TestBlockLedgerConfig {
-      tblcHardForkParams = HardFork.defaultEraParams k slotLength,
+      tblcHardForkParams = (HardFork.defaultEraParams k slotLength) {
+          HardFork.eraGenesisWin = genesisWindow
+        },
       tblcForecastRange = SNothing
     }
 
-    _eraParams :: HardFork.EraParams
-    _eraParams = (HardFork.defaultEraParams k slotLength) {HardFork.eraGenesisWin = genesisWindow}
-
-
 {-------------------------------------------------------------------------------
   Test blocks without payload
 -------------------------------------------------------------------------------}
diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
index 322af9defb..c03639a6bb 100644
--- a/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
+++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/MiniProtocol/BlockFetch/Client.hs
@@ -244,7 +244,6 @@ runBlockFetchTest BlockFetchClientTestSetup{..} = withRegistry \registry -> do
                 , mcdbRegistry = registry
                 , mcdbNodeDBs = nodeDBs
                 }
-          -- TODO: Test with more interesting behaviour for cdbCheckInFuture
           pure $ ChainDB.updateTracer cdbTracer args
         (_, (chainDB, ChainDBImpl.Internal{intAddBlockRunner})) <-
           allocate