diff --git a/ape-config.yaml b/ape-config.yaml
index 5d3ec88..c8cee5b 100644
--- a/ape-config.yaml
+++ b/ape-config.yaml
@@ -24,7 +24,7 @@ foundry:
     ethereum:
       mainnet:
         upstream_provider: alchemy
-        block_number: 15776634
+        block_number: 21418244
       sepolia:
         upstream_provider: alchemy
         block_number: 3091950
diff --git a/ape_foundry/provider.py b/ape_foundry/provider.py
index 9275370..b509abf 100644
--- a/ape_foundry/provider.py
+++ b/ape_foundry/provider.py
@@ -639,7 +639,7 @@ def _extract_custom_error(self, **kwargs) -> str:
         elif "txn" in kwargs:
             txn = kwargs["txn"]
             try:
-                txn_hash = txn.txn_hash if isinstance(txn.txn_hash, str) else txn.txn_hash.hex()
+                txn_hash = txn.txn_hash if isinstance(txn.txn_hash, str) else to_hex(txn.txn_hash)
                 trace = self.get_transaction_trace(txn_hash)
             except Exception:
                 pass
@@ -654,7 +654,7 @@ def set_block_gas_limit(self, gas_limit: int) -> bool:
 
     def set_code(self, address: "AddressType", code: "ContractCode") -> bool:
         if isinstance(code, bytes):
-            code = code.hex()
+            code = to_hex(code)
 
         elif isinstance(code, str) and not is_0x_prefixed(code):
             code = add_0x_prefix(HexStr(code))
@@ -670,8 +670,8 @@ def set_storage(self, address: "AddressType", slot: int, value: HexBytes):
             "anvil_setStorageAt",
             [
                 address,
-                HashBytes32.__eth_pydantic_validate__(slot).hex(),
-                HashBytes32.__eth_pydantic_validate__(value).hex(),
+                to_hex(HashBytes32.__eth_pydantic_validate__(slot)),
+                to_hex(HashBytes32.__eth_pydantic_validate__(value)),
             ],
         )
 
diff --git a/tests/expected_traces.py b/tests/expected_traces.py
index 8a793f8..153d5d3 100644
--- a/tests/expected_traces.py
+++ b/tests/expected_traces.py
@@ -1,7 +1,7 @@
 LOCAL_TRACE = r"""
 Call trace for '0x([A-Fa-f0-9]{64})'
 tx\.origin=0x[a-fA-F0-9]{40}
-ContractA\.methodWithoutArguments\(\) -> 0x00\.\.93bc \[\d+ gas\]
+ContractA\.methodWithoutArguments\(\) -> 0x0000\.\.93bc \[\d+ gas\]
 ├── SYMBOL\.supercluster\(x=234444\) -> \[
 │       \[23523523235235, 11111111111, 234444\],
 │       \[
@@ -55,50 +55,55 @@
     └── ContractC\.methodC1\(windows95="simpler", jamaica=111, cardinal=Contract[A|C]\) \[\d+ gas\]
 """
 MAINNET_FAIL_TRACE_FIRST_10_LINES = r"""
-Call trace for '0x053cba5c12172654d894f66d5670bab6215517a94189a9ffc09bc40a589ec04d'
-reverted with message: "UNIV3R: min return"
-tx\.origin=0xd2f91C13e2D7ABbA4408Cd3D86285b7835524ad7
-AggregationRouterV4\.uniswapV3Swap\(
-  amount=12851675475480000000000,
-  minReturn=4205588148,
-  pools=\[
-    682631518358379038160760928734868612545194078373,
-    5789604461865809771178549250512551984713807685540901737341300416798777562476
+Call trace for '0x605ebd5a54b7d99d9bb61a228a57bfdf8614148c063a5f44e5d52b5a81c2679c'
+reverted with message: "BAL#508"
+tx\.origin=0xF36BCB79C3AD71Bd4E9343f78c402b0f6C99bF34
+AggregationRouterV5\.swap\(
+  executor=AggregationRouterV5,
+  desc=\[
+    AggregationRouterV5,
+    AggregationRouterV5,
+    AggregationRouterV5,
+    tx\.origin,
+
 """
 MAINNET_FAIL_TRACE_LAST_10_LINES = r"""
-    ├── AggregationRouterV4\.uniswapV3SwapCallback\(
-    │     amount0Delta=-4192051335,
-    │     amount1Delta=2098831888913057968,
-    │     0x00\.\.097d
-    │   \) \[9861 gas\]
-    │   ├── UniswapV3Pool.token0\(\) -> FiatTokenProxy \[266 gas\]
-    │   ├── UniswapV3Pool\.token1\(\) -> WETH \[308 gas\]
-    │   ├── UniswapV3Pool\.fee\(\) -> 500 \[251 gas\]
-    │   └── WETH\.transfer\(dst=UniswapV3Pool, wad=2098831888913057968\) -> True \[6062 gas\]
-    └── WETH\.balanceOf\(UniswapV3Pool\) -> 68359883632315875514968 \[534 gas\]
+            48534500000000000000,
+            0x0000\.\.0000
+          ],
+          funds=\['Vault', 0, 'Vault', 0\],
+          limit=0,
+          deadline=1734390153
+        \) ->
+        0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000
+        000000000000000000000000000000000000000000000742414c2335303800000000000000000000000000000000
+        000000000000000000 48534500000000000000 \[7542 gas\]
+
 """
 MAINNET_TRACE_FIRST_10_LINES = r"""
 Call trace for '0xb7d7f1d5ce7743e821d3026647df486f517946ef1342a1ae93c96e4a8016eab7'
 tx\.origin=0x5668EAd1eDB8E2a4d724C8fb9cB5fFEabEB422dc
-DSProxy\.execute\(_target=LoanShifterTaker, _data=0x35\.\.0000\) -> "" \[\d+ gas\]
-└── \(delegate\) LoanShifterTaker\.moveLoan\(
-      _exchangeData=\[
-        0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE,
-        ZERO_ADDRESS,
-        0,
-        0,
+
+Events emitted:
+log LogPermit\(src=0x0000\.\.09ad, dst=0x0000..52dd, sig=0x1cff\.\.0000\)
+log Transfer\(
+  from=CErc20Delegator,
+  to=CErc20Delegator,
+  amount=48354786024690521017562
+\)\[x2\]
 """
 MAINNET_TRACE_LAST_10_LINES = r"""
-    │                   └── LendingRateOracle\.getMarketBorrowRate\(_asset=DAI\) ->
     │                       35000000000000000000000000 \[1164 gas\]
-    ├── DSProxy\.authority\(\) -> DSGuard \[1291 gas\]
-    ├── DSGuard\.forbid\(src=LoanShifterReceiver, dst=DSProxy, sig=0x1c\.\.0000\) \[5253 gas\]
+    ├── CErc20Delegator\.0xbf7e214f\(\) ->
+    │   0x000000000000000000000000b67f15159e1c60d7e5f5b60316c4588b014c61fa \[1291 gas\]
+    ├── DSGuard\.forbid\(src=DSGuard, dst=DSGuard, sig=0x1cff\.\.0000\) \[5253 gas\]
     └── DefisaverLogger\.Log\(
-          _contract=DSProxy,
+          _contract=DefisaverLogger,
           _caller=tx\.origin,
           _logName="LoanShifter",
-          _data=0x00\.\.0000
+          _data=0x0000\.\.0000
         \) \[6057 gas\]
+
 """
 LOCAL_GAS_REPORT = r"""
  +ContractA Gas
diff --git a/tests/test_fork_provider.py b/tests/test_fork_provider.py
index 6806305..e98624f 100644
--- a/tests/test_fork_provider.py
+++ b/tests/test_fork_provider.py
@@ -113,8 +113,8 @@ def test_reset_fork_specify_block_number_via_config(mainnet_fork_provider):
     mainnet_fork_provider.reset_fork()
     block_num_after_reset = mainnet_fork_provider.get_block("latest").number
     block_base_fee_after_reset = mainnet_fork_provider.get_block("latest").base_fee
-    assert block_num_after_reset == 15776634  # Specified in ape-config.yaml
-    assert block_base_fee_after_reset == 28831496753
+    assert block_num_after_reset == 21418244  # Specified in ape-config.yaml
+    assert block_base_fee_after_reset == 12273900931
 
 
 @pytest.mark.fork
diff --git a/tests/test_provider.py b/tests/test_provider.py
index e6379d0..4871668 100644
--- a/tests/test_provider.py
+++ b/tests/test_provider.py
@@ -9,7 +9,7 @@
 from ape_ethereum.trace import Trace
 from ape_ethereum.transactions import TransactionStatusEnum, TransactionType
 from eth_pydantic_types import HashBytes32
-from eth_utils import to_int
+from eth_utils import to_hex, to_int
 from evm_trace import CallType
 from hexbytes import HexBytes
 
@@ -425,7 +425,7 @@ def test_send_transaction_when_no_error_and_receipt_fails(
         receipt_data = {
             "failed": True,
             "blockNumber": 0,
-            "txnHash": tx_hash.hex(),
+            "txnHash": to_hex(tx_hash),
             "status": TransactionStatusEnum.FAILING.value,
             "sender": owner.address,
             "receiver": vyper_contract_instance.address,
diff --git a/tests/test_trace.py b/tests/test_trace.py
index 478bef3..554a823 100644
--- a/tests/test_trace.py
+++ b/tests/test_trace.py
@@ -1,11 +1,11 @@
 import re
 import shutil
 from pathlib import Path
-from typing import List
 
 import pytest
 from ape.exceptions import ContractLogicError
 from ape.utils import create_tempdir
+from eth_utils import to_hex
 from hexbytes import HexBytes
 
 from .expected_traces import (
@@ -17,7 +17,7 @@
     MAINNET_TRACE_LAST_10_LINES,
 )
 
-MAINNET_FAIL_TXN_HASH = "0x053cba5c12172654d894f66d5670bab6215517a94189a9ffc09bc40a589ec04d"
+MAINNET_FAIL_TXN_HASH = "0x605ebd5a54b7d99d9bb61a228a57bfdf8614148c063a5f44e5d52b5a81c2679c"
 MAINNET_TXN_HASH = "0xb7d7f1d5ce7743e821d3026647df486f517946ef1342a1ae93c96e4a8016eab7"
 EXPECTED_MAP = {
     MAINNET_TXN_HASH: (MAINNET_TRACE_FIRST_10_LINES, MAINNET_TRACE_LAST_10_LINES),
@@ -45,7 +45,8 @@ def read_trace(self, expected_start: str, file=None):
 @pytest.fixture(autouse=True, scope="module")
 def full_contracts_cache(config):
     destination = config.DATA_FOLDER / "ethereum"
-    shutil.copytree(BASE_CONTRACTS_PATH, destination)
+    assert BASE_CONTRACTS_PATH.is_dir()
+    shutil.copytree(BASE_CONTRACTS_PATH, destination, dirs_exist_ok=True)
 
 
 @pytest.fixture(
@@ -116,7 +117,7 @@ def test_mainnet_transaction_traces(mainnet_receipt, captrace):
         assert_rich_output(actual_ending, expected_ending)
 
 
-def assert_rich_output(rich_capture: List[str], expected: str):
+def assert_rich_output(rich_capture: list[str], expected: str):
     expected_lines = [x.rstrip() for x in expected.splitlines() if x.rstrip()]
     actual_lines = [x.rstrip() for x in rich_capture if x.rstrip()]
     assert actual_lines, "No output."
@@ -178,4 +179,4 @@ def trace(txn_hash: str, *args, **kwargs):
     assert actual == ""
 
     # Show failure was tracked
-    assert tracker[0] == HexBytes(tx.txn_hash).hex()
+    assert tracker[0] == to_hex(HexBytes(tx.txn_hash))