diff --git a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
index f749e5e729..2d7782103e 100644
--- a/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BOB_Testnet.toml
@@ -1,12 +1,22 @@
 ChainID = '808813'
-FinalityDepth = 900 # compat test finality_depth: ~850
-LogPollInterval = '5s' # compat test block_time:  ~0.5s 
+# OP stack https://docs.gobob.xyz/learn/introduction/op-stack
+ChainType = 'optimismBedrock'
+# finality_depth was: ~850
+FinalityDepth = 900
+# block_time was:  2s
+LogPollInterval = '5s'  
 
-NoNewFinalizedHeadsThreshold = '10m' # with 5s threw PLENTY of [RPC's finalized state is out of sync; no new finalized heads received for 5s (last finalized head received was 4939141)]
+NoNewFinalizedHeadsThreshold = '10m'
 
-FinalityTagEnabled = true #compat test get_logs>supports_finalized_tag: returned true
+FinalityTagEnabled = true
 
 [GasEstimator]
 EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
+[GasEstimator.FeeHistory]
+# block_time was: 2s
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
index ed71c50915..d86cf99bb3 100644
--- a/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Berachain_Testnet.toml
@@ -1,12 +1,18 @@
 ChainID = '80084'
-FinalityDepth = 10 # compat test finality_depth: 1
-LogPollInterval = '5s' # compat test block_time:  ~1.7s 
+# finality_depth: instant
+FinalityDepth = 10 
+# block_time: 5s 
+LogPollInterval = '10s' 
 
-NoNewFinalizedHeadsThreshold = '10m' # with 5s threw PLENTY of [RPC's finalized state is out of sync; no new finalized heads received for 5s (last finalized head received was 4939141)]
-
-FinalityTagEnabled = true #compat test get_logs>supports_finalized_tag: returned true
+FinalityTagEnabled = true
 
 [GasEstimator]
 EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
+[GasEstimator.FeeHistory]
+# block_time was: 5s
+CacheTimeout = '5s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
diff --git a/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml b/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml
index 2df06dafd0..6a00ac9467 100644
--- a/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Bsquared_Testnet.toml
@@ -1,12 +1,23 @@
 ChainID = '1123'
-FinalityDepth = 2000 # compat test finality_depth: ~1900
-LogPollInterval = '5s' # compat test block_time:  ~2s 
+# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time:  ~2s 
+LogPollInterval = '5s' 
 
-NoNewFinalizedHeadsThreshold = '10m' # with 10m threw PLENTY of [RPC's finalized state is out of sync; no new finalized heads received for 10m0s (last finalized head received was 3100170)]
+# finality_depth * block_time / 60 secs = ~66  min (finality time)
+NoNewFinalizedHeadsThreshold = '70m' 
 
-FinalityTagEnabled = true #compat test get_logs>supports_finalized_tag: returned true
+FinalityTagEnabled = true 
 
 [GasEstimator]
 EIP1559DynamicFees = true
 Mode = 'FeeHistory'
 
+[GasEstimator.FeeHistory]
+# block_time was: 2s
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml b/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml
index d36e921918..9ba82d775b 100644
--- a/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Unichain_Testnet.toml
@@ -1,11 +1,22 @@
 ChainID = '1301'
-FinalityDepth = 2000 # compat test finality_depth: ~1900
-LogPollInterval = '5s' # compat test block_time:  ~1s 
+# OP stack: https://docs.unichain.org/docs/getting-started/set-up-a-node#overview
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time was:  ~1s 
+LogPollInterval = '5s' 
 
-NoNewFinalizedHeadsThreshold = '10m' # not sure what to put here, from Worldchain set to 5s threw a huge amount of errors
+NoNewFinalizedHeadsThreshold = '5m'
 
-FinalityTagEnabled = true #compat test get_logs>supports_finalized_tag: returned true
+FinalityTagEnabled = true
 
 [GasEstimator]
 EIP1559DynamicFees = true
-Mode = 'FeeHistory'
\ No newline at end of file
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 1s
+CacheTimeout = '1s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
\ No newline at end of file
diff --git a/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml b/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml
index fb5a6d0bd9..36cde53005 100644
--- a/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/Worldchain_Testnet.toml
@@ -1,11 +1,22 @@
 ChainID = '4801'
-FinalityDepth = 2500 # compat test finality_depth: ~2400, but it also threw 4000 in other round, which is it? 
-LogPollInterval = '5s' # compat test block_time:  ~0.5s 
+# OP stack: https://worldcoin.notion.site/World-Chain-Developer-Preview-Guide-23c94a67683f4e71986e5303ab88c9f3
+ChainType = 'optimismBedrock'
+# finality_depth was: ~2400
+FinalityDepth = 2500 
+# block_time was:  2s 
+LogPollInterval = '5s' 
 
-NoNewFinalizedHeadsThreshold = '10m' # with 5s threw PLENTY of [RPC's finalized state is out of sync; no new finalized heads received for 5s (last finalized head received was 4939141)]
+NoNewFinalizedHeadsThreshold = '10m'
 
-FinalityTagEnabled = true #compat test get_logs>supports_finalized_tag: returned true
+FinalityTagEnabled = true 
 
 [GasEstimator]
 EIP1559DynamicFees = true
 Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s
+CacheTimeout = '2s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
\ No newline at end of file